[Systeme] Better performance