Use Unicode spec during generation, add shorthand classes