Some changes to py client