Converted previous features over to the new syntax