Updated to include new ports