Feat clientutils injection

Resolves issue #790 

Thanks to @clochix :+1: