Updated report architecture