Added client target + more general structure