Added the MH prefix to classes