Added tahg support