Added some extra queries