improving mappings generator and adding d006 testcase