Changes from parser-dev

IEnumerable<> because LINQ