Add .gen support