Moved to serializer.