Add mode/system geom string generation;Refactor