Improved state reporting.