Changes for new reporting