Refactored and added support for ProfileUser