Added character tracking