Capture profile mods

Simple refactoring of ProfileType package.
Enhance functional test.