Change table name
Add types