Updates to helpers