Improved plugins support