Upgrade tables

Upgrade tables to dynamic tables