Switched to kwargs version of plugin constructor