Refactored for params. Added services