ECM Module improvements