Amended previously committed code so that queries take place in their
respective data context class