Use diacritics module instead of baked in version
use random-string module instead of baked in funcstion