Added CharacterMap class