Added support for more odds formats