Added/updated new classes.