(DT-162) Improved Python compatibility