Migrate to geo common model to reduce transitive dependences from common geo.