Improved comprehensions