Added dict comprehension