Updated migration classes with Supplier & Country entity reference