modified URL property keys to be called URI
started work on providing automatic substitution parameters