Geodata improvements