Realized our TypeWrapper in a smarter and more general applicable way.