Update and add support for pyton