Core changes to helpers