Switch to using data files