Migrate Soa to EEF 1.2