Trying to find another solution for job parameter issue
Refactoring