Refactored around requests