Add mapping to uuid

Fixes #1085
Put the right components on the right wrappers

Some wrappers needs some components like readonly.

Fixes #1096
Realign
Release 3.1.0.rc2