Update to latest exrm