add support for ApiKeys to client