Added services as factories