Move Address fields back to Venue model