Updating import and layout to take into account some more hazmat data.