Added context sensitive parsing