refactored plugin for compatibility to v0.4.0
0.3.0