Update to CSV Generation Class