Improvements like Bus firing of events, token attach