Added QueryMapper