Adapt code to changes in generator

Authored by vandenoever on Oct 25 2018, 4:19 PM.