Features/Vault Swap