Fixed add subclasses