Replaced dict comprehension with dict constructor for python 2.6 compatibility