Added more entities, repos and service layers