Request refactoring 2