[Upg] Decrease complexity