Data is one for all protocols;

Ported some changes from .Modular;