Update to modern SQL syntax