Updated Scanner and Parser