More work on the serializer