Fixed build issue and further changes added for plugin.