Updated helpers and notify