Worked more on internal data structures.