Added properties and vault support