Added some additional generic generators