Changed so we have the table info in the db