Updated the disposable classes.