Removed dict comprehension (compatible with python 2.6)