Creating tables now handles numeric vs choices and choices vs choices