Add data generations for demo, remove BOM again