Update to new comprehensions