Major changes on CSV structure