Now implements IDisposable