Changes for NIOM
Signed-off-by: Steven Downer <Grinch@outlook.com>