ParametersParser refactor