Request refactoring