Update to metadata serializer