[feature015] add map and question wrapper