Add unicode support (pass 1)