Finally added ore dictionary support