Tweak the model and add all the classes