Updates to the way node ids are calculated