Use external helpers where possible