diff --git a/LaunchServer/source/command/hash/IndexAssetCommand.java b/LaunchServer/source/command/hash/IndexAssetCommand.java
index 79906e8..6561c21 100644
--- a/LaunchServer/source/command/hash/IndexAssetCommand.java
+++ b/LaunchServer/source/command/hash/IndexAssetCommand.java
@@ -29,7 +29,7 @@
 
 	@Override
 	public String getArgsDescription() {
-		return "<dir> <output-dir>";
+		return "<dir> <index> <output-dir>";
 	}
 
 	@Override
@@ -39,9 +39,10 @@
 
 	@Override
 	public void invoke(String... args) throws Exception {
-		verifyArgs(args, 2);
+		verifyArgs(args, 3);
 		String inputAssetDirName = IOHelper.verifyFileName(args[0]);
-		String outputAssetDirName = IOHelper.verifyFileName(args[1]);
+		String indexFileName = IOHelper.verifyFileName(args[1]);
+		String outputAssetDirName = IOHelper.verifyFileName(args[2]);
 		Path inputAssetDir = LaunchServer.UPDATES_DIR.resolve(inputAssetDirName);
 		Path outputAssetDir = LaunchServer.UPDATES_DIR.resolve(outputAssetDirName);
 		if (outputAssetDir.equals(inputAssetDir)) {
@@ -50,9 +51,7 @@
 
 		// Create new asset dir
 		LogHelper.subInfo("Creating indexed asset dir: '%s'", outputAssetDirName);
-		if (!IOHelper.isDir(outputAssetDir)) {
-			Files.createDirectory(outputAssetDir);
-		}
+		Files.createDirectory(outputAssetDir);
 
 		// Index objects
 		LogHelper.subInfo("Indexing objects");
@@ -60,8 +59,8 @@
 		IOHelper.walk(inputAssetDir, new IndexAssetVisitor(objects, inputAssetDir, outputAssetDir), false);
 
 		// Write index file
-		LogHelper.subInfo("Writing asset index file: '%s'", outputAssetDirName);
-		try (BufferedWriter writer = IOHelper.newWriter(resolveIndexFile(outputAssetDir, outputAssetDirName))) {
+		LogHelper.subInfo("Writing asset index file: '%s'", indexFileName);
+		try (BufferedWriter writer = IOHelper.newWriter(resolveIndexFile(outputAssetDir, indexFileName))) {
 			JSONObject root = new JSONObject();
 			root.put(OBJECTS_DIR, objects);
 			root.write(writer);
diff --git a/LaunchServer/source/command/hash/UnindexAssetCommand.java b/LaunchServer/source/command/hash/UnindexAssetCommand.java
index e49b74e..2d1941c 100644
--- a/LaunchServer/source/command/hash/UnindexAssetCommand.java
+++ b/LaunchServer/source/command/hash/UnindexAssetCommand.java
@@ -45,7 +45,7 @@
 		Files.createDirectory(outputAssetDir);
 
 		// Read JSON file
-		LogHelper.subInfo("Reading asset index file: '%s'", inputAssetDirName);
+		LogHelper.subInfo("Reading asset index file: '%s'", indexFileName);
 		JSONObject objects;
 		try (BufferedReader reader = IOHelper.newReader(IndexAssetCommand.resolveIndexFile(inputAssetDir, indexFileName))) {
 			objects = new JSONObject(new JSONTokener(reader)).getJSONObject(IndexAssetCommand.OBJECTS_DIR);