Merge request

Query Executor support for GridFS
Refactored code