Fix anhance graph performances