Refactor to allow zip code tabulation area data