Refactoring: no decoding until needed (OMS-462)