add geometry and associated data class