Slightly better handling of configuration
Also push the UUID to scope