Initial schema changes per Sam for greater clarity in table.