Refactored the Service and Action classes