Added code page handling