Removed some unused entities
Added unicode field for proper handling of non-ascii