Updated convention to new syntax