Added more to Dispose