More adaption to abstract geometry interface