Added regions
Refactored field names