More Python 2.5 capability