Add BaseQuery
Remove proposed registration name