move to v2 plugin architecture