Refactored requests