Added support for dict and set comprehensions