use new plugins conventions
simplify!