CH2: Add GeoBases support