Added NEI support
Merged