Fixed DataStructures to fit with the current standards