Updated NEI integration.