Added services in entity, will be separate project later on