Added region codes / refactored hierarchy