Add goal1 segment definition and add definition types and related handling on load.