Adding ForEach class, fixing some classes