8.1 Core data setup code migrated