Some minor modifications to schema to allow leagacy data to load.