Changes to granular events and to python client code