diff --git a/addStyles.js b/addStyles.js
index 8d452779..199ea1dd 100644
--- a/addStyles.js
+++ b/addStyles.js
@@ -20,7 +20,7 @@ var stylesInDom = {},
 	singletonCounter = 0,
 	styleElementsInsertedAtTop = [];
 
-module.exports = function(list, options) {
+module.exports = function(object, options) {
 	if(typeof DEBUG !== "undefined" && DEBUG) {
 		if(typeof document !== "object") throw new Error("The style-loader cannot be used in a non-browser environment");
 	}
@@ -33,10 +33,10 @@ module.exports = function(list, options) {
 	// By default, add <style> tags to the bottom of <head>.
 	if (typeof options.insertAt === "undefined") options.insertAt = "bottom";
 
-	var styles = listToStyles(list);
+	var styles = objectToStyles(object);
 	addStylesToDom(styles, options);
 
-	return function update(newList) {
+	return function update(newObject) {
 		var mayRemove = [];
 		for(var i = 0; i < styles.length; i++) {
 			var item = styles[i];
@@ -44,8 +44,8 @@ module.exports = function(list, options) {
 			domStyle.refs--;
 			mayRemove.push(domStyle);
 		}
-		if(newList) {
-			var newStyles = listToStyles(newList);
+		if(newObject) {
+			var newStyles = objectToStyles(newObject);
 			addStylesToDom(newStyles, options);
 		}
 		for(var i = 0; i < mayRemove.length; i++) {
@@ -81,21 +81,30 @@ function addStylesToDom(styles, options) {
 	}
 }
 
-function listToStyles(list) {
+function objectToStyles(object) {
 	var styles = [];
 	var newStyles = {};
-	for(var i = 0; i < list.length; i++) {
-		var item = list[i];
-		var id = item[0];
-		var css = item[1];
-		var media = item[2];
-		var sourceMap = item[3];
-		var part = {css: css, media: media, sourceMap: sourceMap};
-		if(!newStyles[id])
+
+	styles.push(
+		newStyles[object.id] = { id: object.id, parts: [
+			{css: object.content, media: '', sourceMap: object.sourceMap}
+		] }
+	);
+
+	for (var i = 0; i < object.imports.length; i++) {
+		var childObject = object.imports[i][0];
+		var mediaQuery = object.imports[i][1];
+		var id = childObject.id;
+		var css = childObject.content;
+		var sourceMap = childObject.sourceMap;
+		var part = {css: css, media: mediaQuery, sourceMap: sourceMap};
+		if(!newStyles[id]) {
 			styles.push(newStyles[id] = {id: id, parts: [part]});
-		else
+		} else {
 			newStyles[id].parts.push(part);
+		}
 	}
+
 	return styles;
 }
 
diff --git a/index.js b/index.js
index 2b12838d..0b402157 100644
--- a/index.js
+++ b/index.js
@@ -8,15 +8,28 @@ module.exports = function() {};
 module.exports.pitch = function(remainingRequest) {
 	if(this.cacheable) this.cacheable();
 	var query = loaderUtils.parseQuery(this.query);
+
+	var importJs;
+	var loaders = remainingRequest.split('!');
+	if (loaders[0].indexOf('/css-loader/index.js') != -1) {
+		importJs = "import { $css } from " + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ";\n" +
+			"export * from " + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ";\n" +
+			"export { default } from " + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ";\n";
+	} else {
+		importJs = "var $css = {\n" +
+			"\t id: module.id,\n" + 
+			"\t content: require(" + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + "),\n" +
+			"\t mediaQueries: []\n" +
+			"};\n";
+	}
 	return [
 		"// style-loader: Adds some css to the DOM by adding a <style> tag",
-		"",
+		// TODO: Update HMR
+		"var content = { locals: true };",
 		"// load the styles",
-		"var content = require(" + loaderUtils.stringifyRequest(this, "!!" + remainingRequest) + ");",
-		"if(typeof content === 'string') content = [[module.id, content, '']];",
+		importJs,
 		"// add the styles to the DOM",
-		"var update = require(" + loaderUtils.stringifyRequest(this, "!" + path.join(__dirname, "addStyles.js")) + ")(content, " + JSON.stringify(query) + ");",
-		"if(content.locals) module.exports = content.locals;",
+		"var update = require(" + loaderUtils.stringifyRequest(this, "!" + path.join(__dirname, "addStyles.js")) + ")($css, " + JSON.stringify(query) + ");",
 		"// Hot Module Replacement",
 		"if(module.hot) {",
 		"	// When the styles change, update the <style> tags",
