CI classes updated