Refactoring mapping keys for an object
Removing deprecated API for districts