Added tagging functionality on the server