Add gauge support