Changed the class structure of Customer Entities