Add query methods, redo call pattern for requests