More updates to plugin