Added geometry helpers