More ore dictionary support