Major change, updates to primitive link structure