Added data tables for basic and extended reports