Add port handling