Added NEI support