Improved the data structures.