new event dispatcher API + Account model improvement