Update to modern syntax