Fix MessageProcessor to work with current Engine design.