Use direct access instead of comprehension (OMS-510)