Change $Bind & $BindState return types to avoid type error with Descriptor