Add Unicode support
Update version support