Updated accents handling