Added char mapping