SOS-1763 rewrite data to allow for namespacing
SOS-1763 more namespacing