Added character parsing for single and double quote characters