Add mapping to uuid

Fixes #1085