Refactoring Query to extend it\'s use