Some Changes to Framework

Resolves issues facing with New QA Release