Added portId support (untested)