Use newer invocation of generator