Recommendation ITU-T G.807 describes the generic functional architecture of the optical media layer, that supports the propagation of signals within a transport network. This description is independent of the client characteristic information (CI) carried by a signal in the media network. Revision 2 updates the terminology, changing the modulator/demodulator construct to transmitter/receiver. It also aligns (esp. network media channel (NMC)) with the updated terminology in ITU-T G.959.1 (2024) Amd. 1 to include subcarrier modulation and point-to-multipoint optical topology in media architecture. Additionally, clause 10 is reorganized and includes a description of optical tributary signal (OTSi), which carries multiple independent digital clients using synchronization message channel (SCM). Amendment 1 adds the optical media support for free space and distributed fibre optic sensing. New media constructs optical lens, optical circulator and OPM-dfos are added.