Update to get rid of deprecation