Upgrade eval model into current SAFplus