Added further type comprehension of templated types