Add optional target paths to commands