Various additions towards OCNs implementing