Added services, issue with types