Added list comprehension support