Convert Template Class from Static to Instantiated