Add address abstraction to further cleanup node