Added splitting on classes.