Added CommonNode / AbstractNode (finally!)