Added main generator