Added getters to CityBlueprint in demo1 + some refactoring