Added services and unit tests.