Brought up to date with changes in set, sequence and map types