Refactored connections and connectors for authentication support