Nearly completed migration and entity setup