Rest of changes needed to adjust to the schema modifications. Needs
testing.