Changing a set to a map (andrew)
Remove support for serialisation that should never occur
Missing *
Elaine's changes to get outputs working again