Addition of using Template as a class