Added queries for the rest of the tables