Update for new syntaxe