Adding FileHandle MapQuery