Refactoring of params
Merge branch 'master' of https://github.com/nabeel-khan-tp/dgs