Changed query to parametrised method.Added stub for report class
Changed remaining methods to parametrised