Add more generator methods