Modified account class and ProfileService