Changed the way common features between Node and Trace are handled.