Added Generator Classes