Improve API usage. Improve simple reports.