Back to one graph but using proper services (Annotation vs. Activity)
#10601 - back to two graphs
#10601 - update User service definition