Add content unload support