Updated plugin to work with existing  mechanism