Add service tagging + test