Complete venue_spec refactor