Added encapsulation opdr