Refactoring concerning UIDs.

Signed-off-by: Oliver Libutzki <o.libutzki@external.telekom.de>