Request refactor