I don't like it too much either, but I don't think adding it to ```Geodata``` helps me here.