Update ConnectionSettings, more simple implementation