*8857* consider plugin handlers
Merge pull request #132 from bozana/8857_pluginHandlers

*8857* consider plugin handlers