OC-9430 Adding support for endpoint config