add support for unicode characters in builder