Updated to newest generator format.