Move CN API into the OR