I think we should definitely do this before merging - the whole Node vs NodeBase discrepancy is quite confusing.