Adjustments to plugins and mappings