Report class error fixed
Complete For Now
Merge remote-tracking branch 'origin/Dilanka'