diff --git a/.gitignore b/.gitignore
index a579e6ff5..309b4e17d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,8 @@
 /architect.log
 /.DS_Store
 /custom_jre/
+/nbproject/private/
+/target
+/pom.xml
+/lib/power-lib
+/install-mvn-deps.sh
diff --git a/genPom.sh b/genPom.sh
new file mode 100755
index 000000000..b8f0c4e50
--- /dev/null
+++ b/genPom.sh
@@ -0,0 +1,124 @@
+#!/bin/sh
+#
+#Generate the pom.xml and install-mvn-deps.sh files.
+#The install-mvn-deps.sh installs dependencies in the local
+#maven repository.
+
+SCRIPT=`readlink -f "$0"`
+SCRIPTD=${SCRIPT%/*}
+
+POM="pom.xml"
+DEP_SCRIPT="install-mvn-deps.sh"
+
+if [ `pwd` != "${SCRIPTD}" ]; then
+  echo "Script execution must be from the project directory $SCRIPTD"
+  return
+fi
+
+if [ ! -d ./lib/power-lib ]; then
+  echo "sqlpower-library libs do not not exist."
+  echo "copy/link sqlpower-library/lib/main to power-architect/lib/power-lib"
+  echo "copy/link sqlpower-library/dist/sqlpower_library.jar to power-architect/lib/power-lib"
+fi
+
+rm -f "$DEP_SCRIPT"
+rm -f "$POM"
+
+touch $DEP_SCRIPT
+touch $POM
+chmod +x $DEP_SCRIPT
+
+cat <<OUT >> $POM
+
+<?xml version="1.0" ?>
+<project>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.intellires</groupId>
+  <artifactId>power-architect</artifactId>
+  <version>1.0</version>
+  <name>PowerArchitect</name>
+  <packaging>jar</packaging>
+
+  <properties>
+   <maven.compiler.source>11</maven.compiler.source>
+   <maven.compiler.target>11</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+OUT
+
+for file in `ls ./lib/*.jar ./lib/power-lib/*.jar`
+do
+  FILENAME=${file##*/}
+  NAME=${FILENAME%.*}
+
+  ALREADY_DONE=`cat "$DEP_SCRIPT" |grep -c $NAME`
+
+  if [ $ALREADY_DONE -eq 0 ]; then
+    echo "  <dependency>" >> $POM
+    echo "    <groupId>pwr-arch-local-jar</groupId>" >> $POM
+    echo "    <artifactId>"${NAME}"</artifactId>" >> $POM
+    echo "    <version>1</version>" >> $POM
+    echo "  </dependency>" >> $POM
+
+    echo "mvn install:install-file -Dfile="$file" -DgroupId=pwr-arch-local-jar  -DartifactId="${NAME}" -Dversion=1 -Dpackaging=jar" >> ./install-mvn-deps.sh >> $DEP_SCRIPT
+  fi
+done;
+
+ALREADY_DONE=`cat "$DEP_SCRIPT" |grep -c sqlpower_library.jar`
+if [ $ALREADY_DONE -eq 0 ]; then
+  echo "copy/link sqlpower-library/dist/sqlpower_library.jar to power-architect/lib/power-lib"
+fi
+
+cat <<OUT >> $POM
+ </dependencies>
+ <build>
+  <plugins>
+   <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-assembly-plugin</artifactId>
+    <version>3.0.0</version>
+    <configuration>
+     <descriptorRefs>
+      <descriptorRef>jar-with-dependencies</descriptorRef>
+     </descriptorRefs>
+     <archive>
+      <manifest>
+         <mainClass>ca.sqlpower.architect.swingui.ArchitectFrame</mainClass>
+      </manifest>
+     </archive>
+    </configuration>
+    <executions>
+     <execution>
+      <phase>package</phase>
+      <goals>
+       <goal>single</goal>
+      </goals>
+     </execution>
+    </executions>
+   </plugin>
+
+   <plugin>
+     <groupId>org.codehaus.mojo</groupId>
+     <artifactId>exec-maven-plugin</artifactId>
+     <version>3.1.1</version>
+     <configuration>
+       <executable>java</executable>
+       <!-- optional -->
+       <workingDirectory>/tmp</workingDirectory>
+       <arguments>
+         <argument>-classpath</argument>
+         <classpath/>
+         <argument>ca.sqlpower.architect.swingui.ArchitectFrame</argument>
+       </arguments>
+       <!--environmentVariables>
+         <LANG>en_US</LANG>
+       </environmentVariables-->
+     </configuration>
+   </plugin>
+  </plugins>
+ </build>
+</project>
+OUT
+
diff --git a/src/main/java/ca/sqlpower/architect/ArchitectVersion.java b/src/main/java/ca/sqlpower/architect/ArchitectVersion.java
index ddb054693..e34294d60 100644
--- a/src/main/java/ca/sqlpower/architect/ArchitectVersion.java
+++ b/src/main/java/ca/sqlpower/architect/ArchitectVersion.java
@@ -46,14 +46,14 @@ public class ArchitectVersion extends Version {
      * Minor version number. This changes when new features appear that might
      * break forward compatibility.
      */
-    public static final String APP_VERSION_MINOR  = "0";
+    public static final String APP_VERSION_MINOR  = "1";
     
     /**
      * Tiny version number.  This number changes with each release, but resets
      * back to 0 when the minor version changes.  All versions under the same
      * minor version number are fully compatible with each other.
      */
-    public static final String APP_VERSION_TINY   = "11";
+    public static final String APP_VERSION_TINY   = "1";
     
     /**
      * Suffixes indicate pre-release builds.  They normally progress from "alpha"
diff --git a/src/main/java/ca/sqlpower/architect/ProjectSettings.java b/src/main/java/ca/sqlpower/architect/ProjectSettings.java
index 8e01e5166..b891e2db4 100644
--- a/src/main/java/ca/sqlpower/architect/ProjectSettings.java
+++ b/src/main/java/ca/sqlpower/architect/ProjectSettings.java
@@ -60,6 +60,8 @@ public class ProjectSettings extends AbstractSPObject {
     private boolean showAkTag = true;
     
     private ColumnVisibility columnVisibility = ColumnVisibility.ALL;
+
+    private boolean quoteIdentifiers = false;
     
     public static enum ColumnVisibility {
         ALL, 
@@ -171,6 +173,18 @@ public void setColumnVisibility(ColumnVisibility columnVisibility) {
         firePropertyChange("columnVisibility", oldValue, columnVisibility);
     }
 
+    @Accessor(isInteresting=true)
+    public boolean isQuoteIdentifiers() {
+        return quoteIdentifiers;
+    }
+
+    @Mutator
+    public void setQuoteIdentifiers(boolean quoteIdentifiers) {
+        boolean oldValue = this.quoteIdentifiers;
+        this.quoteIdentifiers= quoteIdentifiers;
+        firePropertyChange("quoteIdentifiers", oldValue, quoteIdentifiers);
+    }
+
     @Override
     protected boolean removeChildImpl(SPObject child) {
         return false;
diff --git a/src/main/java/ca/sqlpower/architect/ddl/ConflictResolver.java b/src/main/java/ca/sqlpower/architect/ddl/ConflictResolver.java
index 314dfed1e..f46fcfb65 100644
--- a/src/main/java/ca/sqlpower/architect/ddl/ConflictResolver.java
+++ b/src/main/java/ca/sqlpower/architect/ddl/ConflictResolver.java
@@ -86,7 +86,7 @@ public Conflict(String type, String catalog, String schema, String name) {
         }
         
         public String getQualifiedName() {
-            return DDLUtils.toQualifiedName(catalog, schema, name);
+            return DDLUtils.toQualifiedName(catalog, schema, name, "", "");
         }
         
         /**
diff --git a/src/main/java/ca/sqlpower/architect/ddl/DDLStatement.java b/src/main/java/ca/sqlpower/architect/ddl/DDLStatement.java
index eaafb9313..79005b39e 100644
--- a/src/main/java/ca/sqlpower/architect/ddl/DDLStatement.java
+++ b/src/main/java/ca/sqlpower/architect/ddl/DDLStatement.java
@@ -208,7 +208,7 @@ public void setTargetSchema(String targetSchema) {
 	}
 
     public String toString() {
-        return getType()+" "+DDLUtils.toQualifiedName(getTargetCatalog(), getTargetSchema(), object.getName());
+        return getType()+" "+DDLUtils.toQualifiedName(getTargetCatalog(), getTargetSchema(), object.getName(), "", "");
     }
 
     @Override
diff --git a/src/main/java/ca/sqlpower/architect/ddl/DDLUtils.java b/src/main/java/ca/sqlpower/architect/ddl/DDLUtils.java
index 1c3770362..65ebc2011 100644
--- a/src/main/java/ca/sqlpower/architect/ddl/DDLUtils.java
+++ b/src/main/java/ca/sqlpower/architect/ddl/DDLUtils.java
@@ -60,11 +60,13 @@ private DDLUtils() {
      * </ul>
      * @throws NullPointerException if table is null
      */
-    public static String toQualifiedName(SQLTable table) {
+    public static String toQualifiedName(SQLTable table, String identifierQuoteChar) {
         return toQualifiedName(
                 table.getCatalogName(),
                 table.getSchemaName(),
-                table.getName());
+                table.getName(),
+                identifierQuoteChar,
+                identifierQuoteChar);
     }
     
     /**
diff --git a/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java b/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
index 3bea84c5e..e8162378a 100644
--- a/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
+++ b/src/main/java/ca/sqlpower/architect/ddl/GenericDDLGenerator.java
@@ -164,6 +164,21 @@ public boolean isReservedWord(String word){
     private ArchitectSwingSession session;
 
     private JDBCDataSourceType dsType = null;
+
+    protected String identifierQuoteChar = "";
+    protected String identifierQuoteCharRight = "";
+
+    public boolean isIdentifierQuoted() {
+      return !identifierQuoteChar.isBlank();
+    }
+
+    public String getQuoteLeft() {
+      return identifierQuoteChar;
+    }
+
+    public String getQuoteRight() {
+      return identifierQuoteCharRight;
+    }
     
     public GenericDDLGenerator(boolean allowConnection) throws SQLException {
         this.allowConnection = allowConnection;
@@ -183,6 +198,18 @@ public GenericDDLGenerator() throws SQLException {
 
     public String generateDDLScript(ArchitectSwingSession architectSwingSession, Collection<SQLTable> tables) throws SQLException, SQLObjectException {
         session = architectSwingSession;
+        if (session.getProjectSettings().isQuoteIdentifiers()) {
+          if (this instanceof SQLServerDDLGenerator) {
+            identifierQuoteChar="[";
+            identifierQuoteCharRight="]";
+          } else {
+            identifierQuoteChar = "\"";
+            identifierQuoteCharRight = "\"";
+          }
+        } else {
+          identifierQuoteChar = "";
+          identifierQuoteCharRight = "";
+        }
         List<DDLStatement> statements = generateDDLStatements(tables);
 
 		ddl = new StringBuffer(4000);
@@ -1140,7 +1167,12 @@ public String toIdentifier(String name) {
      * schema are omitted if null).
 	 */
 	public String toQualifiedName(SQLTable t) {
-		return toQualifiedName(t.getPhysicalName());
+        return DDLUtils.toQualifiedName(
+                t.getCatalogName(),
+                t.getSchemaName(),
+                t.getPhysicalName(),
+                identifierQuoteChar,
+                identifierQuoteCharRight);
 	}
 
 	/**
@@ -1163,8 +1195,7 @@ public String toQualifiedName(SQLIndex i) {
     public String toQualifiedName(String tname) {
         String catalog = getTargetCatalog();
         String schema = getTargetSchema();
-        tname = getQuotedPhysicalName(tname);
-        return DDLUtils.toQualifiedName(catalog, schema, tname);
+        return DDLUtils.toQualifiedName(catalog, schema, tname, identifierQuoteChar, identifierQuoteCharRight);
     }
 
 	// ---------------------- accessors and mutators ----------------------
@@ -1466,6 +1497,9 @@ public boolean supportsEnumeration() {
      */
     public String getQuotedPhysicalName(String name) {
         logger.debug(" getQuotedphysical name: "+name);
+        if (name != null && !name.isBlank()) {
+          return identifierQuoteChar+name+identifierQuoteCharRight;
+        }
         return name;
     }
 
diff --git a/src/main/java/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java b/src/main/java/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java
index 53e87f5d9..4d64cefe2 100644
--- a/src/main/java/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java
+++ b/src/main/java/ca/sqlpower/architect/ddl/MySqlDDLGenerator.java
@@ -570,7 +570,7 @@ public void addIndex(SQLIndex index) throws SQLObjectException {
             print("UNIQUE ");
         }
         print("INDEX ");
-        print(toIdentifier(index.getName()));
+        print(getQuotedPhysicalName(toIdentifier(index.getName())));
         if(index.getType() != null) {            
             print(" USING " + index.getType());
         }
diff --git a/src/main/java/ca/sqlpower/architect/ddl/PostgresDDLGenerator.java b/src/main/java/ca/sqlpower/architect/ddl/PostgresDDLGenerator.java
index 285d1f242..516150198 100644
--- a/src/main/java/ca/sqlpower/architect/ddl/PostgresDDLGenerator.java
+++ b/src/main/java/ca/sqlpower/architect/ddl/PostgresDDLGenerator.java
@@ -476,7 +476,7 @@ public boolean supportsEnumeration() {
     @Override
     public String getQuotedPhysicalName(String name) {
         if (name == null) return null;
-        if (getDsType()!=null && (getDsType().getSupportsQuotingName() ||  isComparingDMForPostgres())
+        if (getDsType()!=null && (getDsType().getSupportsQuotingName() ||  isComparingDMForPostgres() ||isIdentifierQuoted())
                 && !name.isEmpty() && !(name.startsWith("\"") && name.endsWith("\""))) {
             name = "\""+name+"\"";
         }
diff --git a/src/main/java/ca/sqlpower/architect/ddl/SQLServerDDLGenerator.java b/src/main/java/ca/sqlpower/architect/ddl/SQLServerDDLGenerator.java
index 300464e22..e7dbd5d9e 100644
--- a/src/main/java/ca/sqlpower/architect/ddl/SQLServerDDLGenerator.java
+++ b/src/main/java/ca/sqlpower/architect/ddl/SQLServerDDLGenerator.java
@@ -405,7 +405,11 @@ public void addComment(SQLTable t, boolean includeColumns) {
 		// So we only write a SQL comment with the table's comment here
 
 		if (t.getRemarks() != null && t.getRemarks().trim().length() > 0) {
-			print("\n-- Comment for table [" + getPhysicalName(t) + "]: ");
+      if (isIdentifierQuoted()) {
+			  print("\n-- Comment for table " + getPhysicalName(t) + ": ");
+      } else {
+			  print("\n-- Comment for table [" + getPhysicalName(t) + "]: ");
+      }
 			print(t.getRemarks().replaceAll(REGEX_CRLF, "\n-- "));
 			endStatement(StatementType.COMMENT, t);
 
@@ -515,7 +519,7 @@ public void addIndex(SQLIndex index) throws SQLObjectException {
             print(" NONCLUSTERED ");
         }
         print("INDEX ");
-        print(DDLUtils.toQualifiedName(null,null,index.getName()));
+        print(DDLUtils.toQualifiedName(null,null,index.getName(),this.identifierQuoteChar, this.identifierQuoteChar));
         print("\n ON ");
         print(toQualifiedName(index.getParent()));
         print("\n ( ");
@@ -770,7 +774,7 @@ protected String columnCheckConstraint(SQLColumn c, List<SQLCheckConstraint> che
     @Override
     public String getQuotedPhysicalName(String name) {
         if (name == null) return null;
-        if (getDsType()!=null && getDsType().getSupportsQuotingName() 
+        if ((getDsType()!=null && getDsType().getSupportsQuotingName() || isIdentifierQuoted())
                 && !name.isEmpty() &&  !(name.startsWith("[") && name.endsWith("]"))) {
             name = "["+name+"]";
         }
diff --git a/src/main/java/ca/sqlpower/architect/etl/kettle/KettleJob.java b/src/main/java/ca/sqlpower/architect/etl/kettle/KettleJob.java
index 4ba4953e0..5d54e0359 100644
--- a/src/main/java/ca/sqlpower/architect/etl/kettle/KettleJob.java
+++ b/src/main/java/ca/sqlpower/architect/etl/kettle/KettleJob.java
@@ -306,7 +306,7 @@ public void doExport(List<SQLTable> tableList, SQLDatabase targetDB, List<SQLTab
 
                 for (SQLTable sourceTable: tableMapping.keySet()) {
                     StringBuffer buffer = tableMapping.get(sourceTable);
-                    buffer.append(" FROM " + DDLUtils.toQualifiedName(sourceTable));
+                    buffer.append(" FROM " + DDLUtils.toQualifiedName(sourceTable, ""));
                 }
 
                 for (SQLTable sourceTable: tableMapping.keySet()) {
@@ -331,7 +331,7 @@ public void doExport(List<SQLTable> tableList, SQLDatabase targetDB, List<SQLTab
                     transMeta.addDatabase(databaseMeta);
 
                     TableInputMeta tableInputMeta = new TableInputMeta();
-                    String stepName = databaseMeta.getName() + ":" + DDLUtils.toQualifiedName(sourceTable);
+                    String stepName = databaseMeta.getName() + ":" + DDLUtils.toQualifiedName(sourceTable, "");
                     StepMeta stepMeta = new StepMeta("TableInput", stepName, tableInputMeta);
                     stepMeta.setDraw(true);
                     stepMeta.setLocation(inputSteps.size()==0?spacing:(inputSteps.size())*spacing, (inputSteps.size()+1)*spacing);
diff --git a/src/main/java/ca/sqlpower/architect/profile/LocalReservoirProfileCreator.java b/src/main/java/ca/sqlpower/architect/profile/LocalReservoirProfileCreator.java
index 4fe981522..c60571c4c 100644
--- a/src/main/java/ca/sqlpower/architect/profile/LocalReservoirProfileCreator.java
+++ b/src/main/java/ca/sqlpower/architect/profile/LocalReservoirProfileCreator.java
@@ -95,7 +95,7 @@ protected boolean doProfileImpl(TableProfileResult tpr)
                 sql.append(col.getName());
                 first = false;
             }
-            sql.append(" FROM ").append(DDLUtils.toQualifiedName(table));
+            sql.append(" FROM ").append(DDLUtils.toQualifiedName(table, ""));
             
             logger.debug("About to execute profiling query: " + sql);
             try {
diff --git a/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSession.java b/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
index 3adc41f33..b69e11454 100644
--- a/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
+++ b/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
@@ -241,6 +241,16 @@ public static interface Saver {
      * Sets whether the AK Tags will be shown
      */
     public void setShowAkTag(boolean showAkTag);
+
+    /**
+     * Will DDL identifiers be quoted.
+     */
+    public boolean isQuoteIdentifiers();
+
+    /**
+     * Sets for quoted DDL identifiers.
+     */
+    public void setQuoteIdentifiers(boolean quoteIdentifiers);
     
     /**
      * Sets the choice of what columns to show
diff --git a/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java b/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
index 35e073c8f..80b3f4091 100644
--- a/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
+++ b/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
@@ -1023,6 +1023,14 @@ public void setShowAkTag(boolean showAkTag) {
         getProjectSettings().setShowAkTag(showAkTag);
     }
 
+    public boolean isQuoteIdentifiers() {
+        return getProjectSettings().isQuoteIdentifiers();
+    }
+
+    public void setQuoteIdentifiers(boolean quoteIdentifiers) {
+        getProjectSettings().setQuoteIdentifiers(quoteIdentifiers);
+    }
+
     /**
      * Sets the visibility of columns in the playpen of this session.
      * 
diff --git a/src/main/java/ca/sqlpower/architect/swingui/ColumnEditPanel.java b/src/main/java/ca/sqlpower/architect/swingui/ColumnEditPanel.java
index 8cb893489..fa2598715 100644
--- a/src/main/java/ca/sqlpower/architect/swingui/ColumnEditPanel.java
+++ b/src/main/java/ca/sqlpower/architect/swingui/ColumnEditPanel.java
@@ -723,7 +723,7 @@ public void valueChanged(TreeSelectionEvent e) {
                     if (selection instanceof SQLColumn) {
                         SQLColumn sourceColumn = (SQLColumn) selection;
                         colSourceButton.setText(DDLUtils.toQualifiedName(
-                                sourceColumn.getParent()) + "." + sourceColumn.getName());
+                                sourceColumn.getParent(), "") + "." + sourceColumn.getName());
                     } else {
                         colSourceButton.setText(Messages.getString("ColumnEditPanel.noneSpecified"));
                     }
@@ -794,7 +794,7 @@ private void updateComponents(SQLColumn col) throws SQLObjectException {
             colSourceTree.setSelectionPath(new TreePath(model.getPathToNode(sourceColumn)));
             colSourceButton.setText(
                     DDLUtils.toQualifiedName(
-                            sourceColumn.getParent()) + "." + sourceColumn.getName());
+                            sourceColumn.getParent(), "") + "." + sourceColumn.getName());
         }
         
         updateComponent(colLogicalName, col.getName());
diff --git a/src/main/java/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java b/src/main/java/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java
index 6a647e59a..ad1395b82 100644
--- a/src/main/java/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java
+++ b/src/main/java/ca/sqlpower/architect/swingui/ProjectSettingsPanel.java
@@ -72,6 +72,7 @@ public class ProjectSettingsPanel extends JPanel implements DataEntryPanel {
     private JCheckBox showPkTag;
     private JCheckBox showFkTag;
     private JCheckBox showAkTag;
+    private JCheckBox quoteIdentifiers;
     
     private JRadioButton showAll;
     private JRadioButton showPkFkUniqueIndexed;
@@ -165,13 +166,16 @@ public void setup() {
         fb.nextLine();
         
         fb.append(showPkFk = new JRadioButton(Messages.getString("ProjectSettingsPanel.showPKFK"))); //$NON-NLS-1$
+        fb.append(quoteIdentifiers = new JCheckBox(Messages.getString("ProjectSettingsPanel.quoteIdentifiers"))); //$NON-NLS-1$
         
         fb.nextLine();
         
         fb.append(showPk = new JRadioButton(Messages.getString("ProjectSettingsPanel.showPK"))); //$NON-NLS-1$
         
         fb.nextLine();
-        
+
+        fb.nextLine();
+
         ButtonGroup column_show_settings = new ButtonGroup();
         column_show_settings.add(showAll);
         column_show_settings.add(showPkFkUniqueIndexed);
@@ -207,6 +211,7 @@ private void revertToProjectSettings() {
             showPkTag.setSelected(session.isShowPkTag());
             showFkTag.setSelected(session.isShowFkTag());
             showAkTag.setSelected(session.isShowAkTag());
+            quoteIdentifiers.setSelected(session.isQuoteIdentifiers());
             
         ColumnVisibility choice = session.getProjectSettings().getColumnVisibility();
         
@@ -268,6 +273,7 @@ public boolean applyChanges() {
         settings.setShowPkTag(showPkTag.isSelected());
         settings.setShowFkTag(showFkTag.isSelected());
         settings.setShowAkTag(showAkTag.isSelected());
+        settings.setQuoteIdentifiers(quoteIdentifiers.isSelected());
         
         if (showAll.isSelected()) {
             settings.setColumnVisibility(ColumnVisibility.ALL);
diff --git a/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java b/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
index a11f3f6f4..eeb2bbb11 100644
--- a/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
+++ b/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
@@ -387,6 +387,15 @@ public Object createObject(Attributes attributes) {
             } else {
                 getSession().setDisplayRelationshipLabel(true);
             }
+
+            String quoteIdentifiers = attributes.getValue("quoteIdentifiers"); //$NON-NLS-1$
+            if (quoteIdentifiers == null) {
+                getSession().setQuoteIdentifiers(false);
+            } else if (!Boolean.valueOf(quoteIdentifiers)) {
+                getSession().setQuoteIdentifiers(false);
+            } else {
+                getSession().setQuoteIdentifiers(true);
+            }
             
         	String relStyle = attributes.getValue("relationship-style"); //$NON-NLS-1$
             boolean direct;
@@ -1207,6 +1216,7 @@ private void savePlayPen(PrintWriter out, PlayPen pp, boolean isRelational) {
             tagText.append(" showAlternateTag=\"").append(getSession().isShowAkTag()).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
             tagText.append(" columnVisibility=\"").append(getSession().getColumnVisibility()).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
             tagText.append(" relationshipLabelVisibility=\"").append(getSession().isDisplayRelationshipLabel()).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
+            tagText.append(" quoteIdentifiers=\"").append(getSession().isQuoteIdentifiers()).append("\""); //$NON-NLS-1$ //$NON-NLS-2$
         }
         tagText.append(">"); //$NON-NLS-1$
         ioo.println(out, tagText.toString());
diff --git a/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java b/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
index db627629e..001655af0 100644
--- a/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
+++ b/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java
@@ -71,6 +71,7 @@
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
+import javax.swing.tree.TreeNode;
 
 /**
  * Shows the users and groups in the system workspace and allows them to be
@@ -188,9 +189,9 @@ public void actionPerformed(ActionEvent e) {
                     }
                         
                     refreshTree();
-                    Enumeration<DefaultMutableTreeNode> userNodes = usersNode.children();
+                    Enumeration<TreeNode> userNodes = usersNode.children();
                     while (userNodes.hasMoreElements()) {
-                        DefaultMutableTreeNode dmtn = userNodes.nextElement();
+                        DefaultMutableTreeNode dmtn = (DefaultMutableTreeNode) userNodes.nextElement();
                         if (((User) dmtn.getUserObject()).getUUID().equals(user.getUUID())) {
                             tree.setSelectionPath(new TreePath(dmtn.getPath()));
                         }
@@ -207,9 +208,9 @@ public void actionPerformed(ActionEvent e) {
                 if (group != null) {
                     securityWorkspace.addChild(group, securityWorkspace.getChildren(Group.class).size());
                     refreshTree();
-                    Enumeration<DefaultMutableTreeNode> userNodes = groupsNode.children();
+                    Enumeration<TreeNode> userNodes = groupsNode.children();
                     while (userNodes.hasMoreElements()) {
-                        DefaultMutableTreeNode dmtn = userNodes.nextElement();
+                        DefaultMutableTreeNode dmtn = (DefaultMutableTreeNode) userNodes.nextElement();
                         if (((Group) dmtn.getUserObject()).getUUID().equals(group.getUUID())) {
                             tree.setSelectionPath(new TreePath(dmtn.getPath()));
                         }
diff --git a/src/main/resources/ca/sqlpower/architect/swingui/messages.properties b/src/main/resources/ca/sqlpower/architect/swingui/messages.properties
index ae2f104d1..c2428e859 100644
--- a/src/main/resources/ca/sqlpower/architect/swingui/messages.properties
+++ b/src/main/resources/ca/sqlpower/architect/swingui/messages.properties
@@ -328,6 +328,7 @@ ProjectSettingsPanel.showPK=Show PK Columns only
 ProjectSettingsPanel.showPKFKUnique=Show PK + FK + Unique Columns
 ProjectSettingsPanel.snapshotSourceDbOption=Snapshot Entire Source Database in Project File?
 ProjectSettingsPanel.visibilityOfRelationshipLabel=Display or Hide Relationship Labels:
+ProjectSettingsPanel.quoteIdentifiers=Quote DDL identifiers?
 Relationship.setFocusMenu=Set Focus to...
 Relationship.relationshipLineColor=Relationship Line Color
 RelationshipEditPanel.fkLabel= FK Table Label
diff --git a/src/main/resources/ca/sqlpower/architect/swingui/messages_de.properties b/src/main/resources/ca/sqlpower/architect/swingui/messages_de.properties
index 9d78e4439..04c7e4961 100644
--- a/src/main/resources/ca/sqlpower/architect/swingui/messages_de.properties
+++ b/src/main/resources/ca/sqlpower/architect/swingui/messages_de.properties
@@ -300,6 +300,7 @@ ProjectSettingsPanel.showPK=Zeige nur Spalten des Prim\u00e4rschl\u00fcssel
 ProjectSettingsPanel.showPKFKUnique=Zeige PK + FK + Unique Spalten
 ProjectSettingsPanel.snapshotSourceDbOption=Gesamten Datenbankinhalt in der Projektdatei speichern?
 ProjectSettingsPanel.visibilityOfRelationshipLabel=Zeige/verstecke Beschriftung der Verbindungslinien:
+ProjectSettingsPanel.quoteIdentifiers=Quote DDL identifiers?
 Relationship.setFocusMenu=Fokus auf...
 Relationship.relationshipLineColor=Farbe der Verbindungslinie
 RelationshipEditPanel.fkLabel=Beschriftung f\u00fcr FK Tabelle
diff --git a/src/main/resources/ca/sqlpower/architect/swingui/messages_ko.properties b/src/main/resources/ca/sqlpower/architect/swingui/messages_ko.properties
index 4c7e69f5e..84a9c08ef 100644
--- a/src/main/resources/ca/sqlpower/architect/swingui/messages_ko.properties
+++ b/src/main/resources/ca/sqlpower/architect/swingui/messages_ko.properties
@@ -277,6 +277,8 @@ ProjectSettingsPanel.showPrimaryKeyColumns=\uae30\ubcf8\ud0a4 \uceec\ub7fc \ubcf
 ProjectSettingsPanel.showRemainingColumns=\ub0a8\uc740 \uceec\ub7fc \ubcf4\uc774\uae30
 ProjectSettingsPanel.showUniqueColumns=\uc720\ub2c8\ud06c \uceec\ub7fc \ubcf4\uc774\uae30
 ProjectSettingsPanel.snapshotSourceDbOption=\ud504\ub85c\uc81d\ud2b8 \ud30c\uc77c\uc5d0\uc11c \uc804\uccb4 \uc6d0\ubcf8 \ub370\uc774\ud130\ubca0\uc774\uc2a4 \uc2a4\ub0c5\uc0f7\uc744 \uc0dd\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
+ProjectSettingsPanel.visibilityOfRelationshipLabel=Display or Hide Relationship Labels:
+ProjectSettingsPanel.quoteIdentifiers=Quote DDL identifiers?
 Relationship.setFocusMenu=\ud3ec\ucee4\uc2a4 \uc124\uc815...
 SQLScriptDialog.closeOption=\ub2eb\uae30
 SQLScriptDialog.continuePrompt=\uacc4\uc18d\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
diff --git a/src/main/resources/ca/sqlpower/architect/swingui/messages_pt.properties b/src/main/resources/ca/sqlpower/architect/swingui/messages_pt.properties
index af87739c8..d478ecb51 100644
--- a/src/main/resources/ca/sqlpower/architect/swingui/messages_pt.properties
+++ b/src/main/resources/ca/sqlpower/architect/swingui/messages_pt.properties
@@ -300,6 +300,7 @@ ProjectSettingsPanel.showPK=Mostrar apenas Colunas de PK
 ProjectSettingsPanel.showPKFKUnique=Mostrar Colunas PK + FK + Chave \u00danica
 ProjectSettingsPanel.snapshotSourceDbOption=Capturar a fonte de dados na \u00edntegra para o arquivo de projeto?
 ProjectSettingsPanel.visibilityOfRelationshipLabel=Mostrar ou Ocultar r\u00f3tulos de Relacionamentos:
+ProjectSettingsPanel.quoteIdentifiers=Quote DDL identifiers?
 Relationship.setFocusMenu=Definir o Foco para ...
 Relationship.relationshipLineColor=Cor de linha do Relacionamento
 RelationshipEditPanel.fkLabel= R\u00f3tulo da Tabela da FK
diff --git a/src/main/resources/ca/sqlpower/architect/swingui/messages_ru.properties b/src/main/resources/ca/sqlpower/architect/swingui/messages_ru.properties
index f7232bb6c..b5a689f60 100644
--- a/src/main/resources/ca/sqlpower/architect/swingui/messages_ru.properties
+++ b/src/main/resources/ca/sqlpower/architect/swingui/messages_ru.properties
@@ -267,6 +267,8 @@ ProjectSettingsPanel.showPrimaryKeyColumns= \u041f\u043e\u043a\u0430\u0437\u0430
 ProjectSettingsPanel.showRemainingColumns= \u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u0435 \u0441\u0442\u043e\u043b\u0431\u0446\u044b
 ProjectSettingsPanel.showUniqueColumns= \u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u0441\u0442\u043e\u043b\u0431\u0446\u044b
 ProjectSettingsPanel.snapshotSourceDbOption=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043a\u043e\u043f\u0438\u044e \u0438\u0441\u0445\u043e\u0434\u043d\u0443\u044e \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 \u0432 \u0444\u0430\u0439\u043b\u0435 \u041f\u0440\u043e\u0435\u043a\u0442\u0430?
+ProjectSettingsPanel.visibilityOfRelationshipLabel=Display or Hide Relationship Labels:
+ProjectSettingsPanel.quoteIdentifiers=Quote DDL identifiers?
 Relationship.setFocusMenu=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0444\u043e\u043a\u0443\u0441 \u043d\u0430...
 SearchReplace.anythingSearchOption=\u041b\u044e\u0431\u043e\u0435
 SearchReplace.columnOfTable=\u0421\u0442\u043e\u043b\u0431\u0435\u0446 \u0438\u0437 {0}