Changed to using URI because gives type safety on long argument list.