Added more convenient query methods in Database class, starting to replace calls everywhere