Migrate to plugin 0.2.16