Updated helpers