ProfileUnit Refactor [MJ-458]

All Test Pass