Updated Settlement/City constructors