Added more query methods