Updated to support cleaned up tag service