Some updates to support basic reporting output.