Adding plugins mapping with new method
Merge branch 'develop'