Upgraded plugin to milestone-18