Added better python support