* added aliases to Profiles
* Did some refactoring and clean-up in Composition