Add deletion helpers and autodelete