Update StatesClient for simplified version