Started refactoring to get using params object for working cycle.