Adding service manager and diagram manager part2