Adding an optional FK to residence, and the state field on residence