added --base-uri and non-sdv handling