Added tagging and user invite support