Update to convenience functions.