Added base Query classes