Complete profiles refactor