Added further URI support