Converting comms layer to inlined