Refine and add some mappings.