Updated to add oredict compat