[Improved] Chat vault support