Improving geometry table