[MS]: Changed type of report saving. Added validation and some code
refactoring