Change to use Orno-Di 2.x