Adds @servicetag annotations