Being a bit more flexible about how the geometries are parsed