Use proper data structures for state and district lists