Don't use dict comprehensions to be compatible with Python 2.6