Updated cherry-plugin