Feature#74 profile refactoring