Fix json generated classes, adding components