Uses opid map now