fix mapping and add plugin