Added support for olid.