Added support for ForEach