Updated to modern syntax