Make odi compatible