Fixed serializer for preview