Updates to ERPS to Handle Port References in Service Port