Plugin changes and minor mapping