Adding ability to resolve generic types