Added the generators, need namespace them now