Refactor to new syntax