Refactored REST Services