Update to new default functions