Feat clientutils injection