Reorganized helpers