add plugin and fix mapping