Use new style files