Moved BaseQuery to sobjects
Merge