Add more get methods to query