Upated with the new version of NMM, combined the old model classes
with the new visual classes