Update to 3.0 syntax