Update for plugin 0.9.21