Added generator options