Switch to flatfile format