updates for migration from schema 2