Add more -ports stuff