[Upg] decrease complexity
[Upg] Use array of parameters