BUFR template used for moored buoy data should be now TM315008 recently validated. As for drifting buoys, GTS headers for moored buoy data start with character string 'IOB'.