Rename some field name
Add directives for each column type