Some updates to the data Structures.