Added QueryMap and QueryMapSlice