Added ApiClient interface .. Still long way to go