Improve data structure