Fixed warning
Added Generator