Added a serializer