GovernmentChecker improvements