Move some things to City's addon