Enhance the python support