Add unicode comment
Propose some API organization