Modified generators, added several necessary gems