Add handling of already defined classes.