Changed serializer, updating samples