Refactored data requests to take advantage of abstract models