Start of changes for new protocols.
Some rework on the service bits.