Improve type data structures