Upgrade to modern syntax