Adding initial support for query methods