Update plugin to work with version 6