Add configurability of os_endpoint_type