Re-worked inline-groups and added composites