Add definitions and recalc methods for further geometries