Update service class structure to handle all entity related operations