Added internal encoding