Updated various branches of plugin