Updated Python classes