Added disposable and corruptable interfaces to a lot of classes that
needed them