Allow credential overrides
Add encrypted keys