Create client use case minor adjustments