New base helper files fork