added: QueryMapper