API: Update query modules for MCR