Refactored services; changed naming