Upgrade table factory classes