Feature/3887 mapping for plugins