Updates to new syntax.