Added more repositories and moved more queries to them.