* Entity mappings * More mappings * A few more names * More entity mappings * Update CompositeTask.mapping