Refactored QueryMethod initialisers