Fix lunch factory and model spec