Added __serialized support