Updates to latest DataStructures