Add support for persistent tabs