Anirudha : NPSReport generation refactored