Update to improved syntax