Added changes for file controller and plugin.