Adding element name witness to Map
Location hack for S3 List witnesses
WIP
Adding additional serialisation witnesses to Map