Add just connection settings support