Rewrote serializer