Added destroy/isDestroyed support