V0.15 plugin refactors