Added oredict support