Updated helpers.