--Added IDisposable to Entity to allow for Entity disposal