Fixed defsystem dependency
Added uri= and uri-matches
Added exports for uri
Added specified interfaces database and data-model.
Added MERGE-URIS
Minor