Update to match ports tree