Improved city loading