Added Generator class