Changes for State Parser