Various changes. Added Vault