Added first version of the generator