Made core elements Disposable where applicable