Added some more query methods