Updates to reflect removal of Port class from core