Fix NEI support to dynamically accept different gas types