Removed dictionary comprehension syntax for Python 2.6 compatibility reasons