Update path and URI definitions