Added thor
Added generators