STORM-91 : Plugin change reverted as we need to cleanup service.data.instance everytime its updated