Updated some query methods