Upgrade rule checking. Add more meta