Updated country hooks