Better documentation and reporting