Update UML documentation
Fix wrong include
Cosmetic code change