Generalization of more aspects of engine.