diff --git a/packages/std/uri.js b/packages/std/uri.js
index <HASH>..<HASH> 100644
--- a/packages/std/uri.js
+++ b/packages/std/uri.js
@@ -15,9 +15,9 @@ var attrs = [
 	"anchor"
 ];
 
-exports = Class(function(supr) {
+var URI = exports = Class(function(supr) {
 	this.init = function(url, isStrict) {
-		if (url instanceof exports) {
+		if (url instanceof URI) {
 			for (attr in attrs) {
 				this['_' + attr] = url['_' + attr];
 			}
@@ -43,6 +43,9 @@ exports = Class(function(supr) {
 			};
 		}).call(this, attr);
 	};
+	
+	this.query = function(key) { return exports.parseQuery(this._query)[key]; }
+	this.hash = function(key) { return exports.parseQuery(this._hash)[key]; }
 
 	this.toString = this.render = function(onlyBase) {
 		// XXX TODO: This is vaguely reasonable, but not complete. fix it...
@@ -60,8 +63,6 @@ exports = Class(function(supr) {
 	};
 });
 
-exports.Uri = exports; // backwards compatibility?
-
 exports.relativeTo = function(url, base) {
 	url = String(url);
remove backwards compatible uri.uri; add query and hash methods to a URI object to get at keys in the URI easily