If this is gonna change once we have the final tables, will it be worth adding the right ones and adding the SQL creation scripts in this PR?