Handling this with keychain now