Modified schema creation and prepopulation scripts to reflect latest schema changes.