Add city fields to all types and autoset these values