Change data structures for performance