Updated Dispose Method