Refactor geographical models