Re-factored services for better design