Major change: add port for each site