Moved internal helper to public helpers files