added idmap, normalized style