Refactored resourceCtrl/Service