Added Character class to refactoring process