Simplify non-SAP connectivity