Migrated to latest Core assemblies