Refactored request