Added character parsing