Manage session states
Fix subscription and state management