Adding support for ALL ports and ALL protocols