Added services, fix minification