Improve data structures