Feature #62, refactoring GridFS implementation