Working towards moving nodedatum out of models