Reordered table creation so a rebuild will work