Added missing Python 3 support