more schema and migration updates