Reduced number of queries