Username attached to data map entry

The start of what David proposes