Replaced PEX with Vault for better integration