Modifications for unicode handling