Updated for plugins