Added cached copies of the queryes