CHANGE: Added flexibilty for handeling UserProfile