Added IDisposable and Properties