Expanded the plugin functionality.