Refactored request object