Moving STATES and VALID_STATES back into address model