incorporated the new CDAP class into RMT