Modifications for plugins