Moving report to persistence package