Supporting new/custom geometry