Add better tag for logging