Streamlined reports and made them a little bit more extensible