Making keychain optional