Added first version of generator