Updated setup code after changing table structure

Also added new pre-population data.