Moved into odslib