Adapt generator to vizabi changes