Updated Client interface