Update for SDN compatability