Update syntax and deprecations