Improve datastructure.