Added generator id and options