Added configuration options for district assignment