Fix Address Model and clean up other models