 
     /// Data that's saved in the keychain.
     var data: [String: AnyObject] {
-        return ["password": password, "serverAddress": serverAddress]
+        return [KeychainDataKey.Password.rawValue: password, KeychainDataKey.ServerAddress.rawValue: serverAddress]
     }
 }
 


/// Contains all data necessary to authenticate a user at the server.
struct AuthenticationData {

    //MARK: Properties



    /// The service that the authentication data is saved under in the keychain.
    var service: String {
        return AuthenticationData.KeychainService
    }

    /// The account that identifies the authentication data in the keychain.
