Many changes.

Delete CSV file handling.
Add specific type definitions in certain types of targeted statements.