Removed fancy map construct for Python 2.6 compatibility