Updated with refactoring of geometry & segmentation classes;