Moved NodeAddress to own file