make add uri optional, expose cli module, update justification