Added state serializer