Starting to add credential storage