Work on node_domain,
Some refactoring