Plugins

Updated changes for plugin functionality.