Changed the Character class hieracrchy