Client: updated to work with the new API updates