Adding generating on-demand support.