Added services and APIs distinction