Made some types Disposable