Added few more changes for plugin.