Finished up NEI support