Code updates to work with new data.