Update to new syntax (documentation not yet updated and does not build)