minor changes related to URI and model changes