Reworked Vault & Config