WIP - plugin refact