Removing more logic from Requests