Made requiste changes for plugin