Upgrade conditionals to latest API