Add ServiceElementManager
Add missing fields to ServiceElement
Merge branch 'origin/development'