Adding fast queries