MADS: Replaced a TODO with a stubbed method