Add options field, move trunk into branches option.