Refactored request service