Add clause to check for, and handle CHDWB data