NSM: add methods for saving expand state but they don't work
NSM: replace gotEntity with EntityManager
NSM: update UpManager