Add ALL and ROVER classes