EES-14801 Refactored gem and added support for ProfileUser