Updated structure to support report generators