Added more functionality to plugin.