Added initial validation of URIs