Port IdArray and IdTable to NMF
Update to reflect IdArray/IdTable changes
Add missin includes