Reflecting latest changes from plugin.