Progress making import and reporting process a bit more robust.