Added geometry management.