Code refactor. Moved logic to getReportProviderClass a more appropriate class