add custom Client and fix missing imports