Updated for E9 integrations