Added lots of generator methods