Refactored more requests