Implemented IDisposable and Short Names