Final smart policy scoring and Parser changes