Make compatible with olio changes