Add auto-expire functionality