Feature/base client