diff --git a/src/osm/jp/coverage/postoffice/DbPostoffice.java b/src/osm/jp/coverage/postoffice/DbPostoffice.java
index dfad401..17ac222 100644
--- a/src/osm/jp/coverage/postoffice/DbPostoffice.java
+++ b/src/osm/jp/coverage/postoffice/DbPostoffice.java
@@ -1,5 +1,6 @@
 package osm.jp.coverage.postoffice;
 
+import hayashi.tools.files.DeleteDir;
 import java.io.*;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -34,7 +35,7 @@
         File dir = new File("database");
         if (dir.exists()) {
             if (dir.isDirectory()) {
-                dir.deleteOnExit();
+                DeleteDir.delete(dir);
             }
         }
         
@@ -272,7 +273,14 @@
         //Db.drop(con, TABLE_NAME);
         createSt = "CREATE TABLE  "+ TABLE_NAME2 +" (idref VARCHAR(12) NOT NULL, lat DOUBLE, lon DOUBLE)";
         Db.updateSQL(con, createSt);
-        createSt = "CREATE TABLE "+ TABLE_NAME +" (gid INT, idref VARCHAR(12) NOT NULL, fixed INT, area INT, up INT, fixed1 INT)";
+        
+        createSt = "CREATE UNIQUE INDEX id2 ON "+ TABLE_NAME2 +" (idref)";
+        Db.updateSQL(con, createSt);
+        
+        createSt = "CREATE TABLE "+ TABLE_NAME +" (gid INT, idref VARCHAR(12) NOT NULL, area INT, lat DOUBLE, lon DOUBLE, up INT, fixed INT, fixed1 INT)";
+        Db.updateSQL(con, createSt);
+
+        createSt = "CREATE INDEX id1 ON "+ TABLE_NAME +" (idref, lat, lon)";
         Db.updateSQL(con, createSt);
     }