Change discovery id to a class.
Add missing attributes to ServiceElement
Add SystemProperties. This is uesed to get system properties for Integer