Widen scope of helpers