Added CSV and removed HTML Generation.