Updated to support 3rd plugins