Added support for generifiable invocations