Refactoring plugins. Created new trait pluggable