Modified following plugins to fit the new format