Updated reporting classes to work with latest kenyacore where report descriptors have report definition targets