Moved termination condition to model description