Added generator interface