More updates for the new class based query system