Transition helpers to new syntax