Added generator for faster iteration