Changed uri property for consistency