[HAM] Restore missing helper functions