Refactored & simplified base model (MadModel)