Made the ECM type more flexible.