Added to the basic generator, and put in object layouts