Converting additional classes to new model