Changes for report manager