Added dedicated serializer