Update for gl_generator's changes