Add Query class as additional extension point