Improved EAP module model.