Separate geometry and feature type hierarchies