Fix the structure of geographical models