More change for AwReportingServer