diff --git a/Migration.cfc b/Migration.cfc
index 6f32b35..fb5ca8b 100644
--- a/Migration.cfc
+++ b/Migration.cfc
@@ -201,84 +201,56 @@
 		<cfargument name="table" type="string" required="true" hint="table name">
 		<cfscript>
 			var loc = {};
-			loc.columnNames = "";
-			loc.columnValues = "";
+			loc.values = {};
 			for (loc.key in arguments) {
 				if(loc.key neq "table") {
-					loc.columnNames = ListAppend(loc.columnNames,this.adapter.quoteColumnName(loc.key));
-					if(IsNumeric(arguments[loc.key])) {
-						loc.columnValues = ListAppend(loc.columnValues,arguments[loc.key]);
-					} else if(IsBoolean(arguments[loc.key])) {
-						loc.columnValues = ListAppend(loc.columnValues,IIf(arguments[loc.key],1,0));
-					} else if(IsDate(arguments[loc.key])) {
-						loc.columnValues = ListAppend(loc.columnValues,"#arguments[loc.key]#");
-					} else {
-						loc.columnValues = ListAppend(loc.columnValues,"'#ReplaceNoCase(arguments[loc.key],"'","''","all")#'");
-					}
+					loc.values[ loc.key ] = arguments[ loc.key ];
 				}
 			}
-			if(loc.columnNames != '') {
-				if(ListContainsNoCase(loc.columnnames, "[id]")) {
-					$execute(this.adapter.addRecordPrefix(arguments.table));
-				}
-				$execute("INSERT INTO #this.adapter.quoteTableName(LCase(arguments.table))# ( #loc.columnNames# ) VALUES ( #loc.columnValues# )");
-				if(ListContainsNoCase(loc.columnnames, "[id]")) {
-					$execute(this.adapter.addRecordSuffix(arguments.table));
-				}
+			if( NOT structIsEmpty( loc.values ) ) {
+				$execute( this.adapter.addRecord( arguments.table, loc.values ) );
 				announce("Added record to table #arguments.table#");
 			}
 		</cfscript>
 	</cffunction>
 
+
 	<cffunction name="updateRecord" returntype="void" access="public" hint="updates an existing record in a table">
 		<cfargument name="table" type="string" required="true" hint="table name">
 		<cfargument name="where" type="string" required="false" default="" hint="where condition">
 		<cfscript>
 			var loc = {};
-			loc.columnUpdates = "";
+			loc.values = {};
 			for (loc.key in arguments) {
-				if(loc.key neq "table" && loc.key neq "where") {
-					loc.update = "#this.adapter.quoteColumnName(loc.key)# = ";
-					if(IsNumeric(arguments[loc.key])) {
-						loc.update = loc.update & "#arguments[loc.key]#";
-					} else if(IsBoolean(arguments[loc.key])) {
-						loc.update = loc.update & "#IIf(arguments[loc.key],1,0)#";
-					} else if(IsDate(arguments[loc.key])) {
-						loc.update = loc.update & "#arguments[loc.key]#";
-					} else {
-						arguments[loc.key] = ReplaceNoCase(arguments[loc.key], "'", "''", "all");
-						loc.update = loc.update & "'#arguments[loc.key]#'";
-					}
-					loc.columnUpdates = ListAppend(loc.columnUpdates,loc.update);
+				if(loc.key neq "table" AND loc.key neq "where") {
+					loc.values[ loc.key ] = arguments[ loc.key ];
 				}
 			}
-			if(loc.columnUpdates != '') {
-				loc.sql = 'UPDATE #this.adapter.quoteTableName(LCase(arguments.table))# SET #loc.columnUpdates#';
+			if( NOT structIsEmpty( loc.values ) ) {
+				$execute( this.adapter.updateRecord( arguments.table, arguments.where, loc.values ) );
 				loc.message = 'Updated record(s) in table #arguments.table#';
 				if(arguments.where != '') {
-					loc.sql = loc.sql & ' WHERE #arguments.where#';
 					loc.message = loc.message & ' where #arguments.where#';
 				}
-				$execute(loc.sql);
 				announce(loc.message);
 			}
 		</cfscript>
 	</cffunction>
+	
 
 	<cffunction name="removeRecord" returntype="void" access="public" hint="removes existing records from a table">
 		<cfargument name="table" type="string" required="true" hint="table name">
 		<cfargument name="where" type="string" required="false" default="" hint="where condition">
 		<cfscript>
 			var loc = {};
-			loc.sql = 'DELETE FROM #this.adapter.quoteTableName(LCase(arguments.table))#';
+			$execute( this.adapter.removeRecord( arguments.table, arguments.where ) );
 			loc.message = 'Removed record(s) from table #arguments.table#';
 			if(arguments.where != '') {
-				loc.sql = loc.sql & ' WHERE #arguments.where#';
 				loc.message = loc.message & ' where #arguments.where#';
 			}
-			$execute(loc.sql);
 			announce(loc.message);
 		</cfscript>
 	</cffunction>
 
-</cfcomponent>
\ No newline at end of file
+
+</cfcomponent>
diff --git a/TableDefinition.cfc b/TableDefinition.cfc
index 93255f4..a5923d3 100755
--- a/TableDefinition.cfc
+++ b/TableDefinition.cfc
@@ -34,7 +34,7 @@
 		<cfargument name="name" type="string" required="yes" hint="primary key column name">
 		<cfargument name="type" type="string" required="false" default="integer" hint="type for the primary key column">
 		<cfargument name="autoIncrement" type="boolean" required="no" default="false">    
-		<cfargument name="limit" type="numeric" required="no" hint="character or integer size">
+		<cfargument name="limit" type="string" required="no" hint="character or integer size">
 		<cfargument name="precision" type="numeric" required="no" hint="number of digits the column can hold">
 		<cfargument name="scale" type="numeric" required="no" hint="number of digits that can be placed to the right of the decimal point (must be less than or equal to precision)">
 		<cfargument name="references" type="string" required="no" hint="table this primary key should reference as a foreign key">
@@ -68,28 +68,28 @@
 		<cfargument name="columnType" type="string" required="yes" hint="column type">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
-		<cfargument name="limit" type="numeric" required="no" hint="character or integer size">
-		<cfargument name="precision" type="numeric" required="no" hint="number of digits the column can hold">
+		<cfargument name="limit" type="string" required="no" hint="character or integer size">
+		<cfargument name="precision" type="string" required="no" hint="number of digits the column can hold">
 		<cfargument name="scale" type="numeric" required="no" hint="number of digits that can be placed to the right of the decimal point (must be less than or equal to precision)">
+		<cfargument name="encoding" type="string" required="no" hint="character encoding: unicode, ascii or others">
 		<cfscript>
 			var loc = {};
 			arguments.adapter = this.adapter;
 			arguments.name = arguments.columnName;
 			arguments.type = arguments.columnType;
-			loc.column = CreateObject("component","ColumnDefinition").init(argumentCollection=arguments);
+			loc.column = createObject("component","ColumnDefinition").init(argumentCollection=arguments);
 			ArrayAppend(this.columns,loc.column);
 		</cfscript>
 		<cfreturn this>
 	</cffunction>
 	
-	<cffunction name="bigInteger" returntype="any" access="public" hint="adds integer columns to table definition">
+	<cffunction name="binary" returntype="any" access="public" hint="adds binary columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
-		<cfargument name="limit" type="numeric" required="no" hint="integer size">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
 		<cfscript>
 			var loc = {};
-			arguments.columnType = "biginteger";
+			arguments.columnType = "binary";
 			loc.iEnd = ListLen(arguments.columnNames);
 			for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
 				arguments.columnName = ListGetAt(arguments.columnNames,loc.i);
@@ -99,13 +99,13 @@
 		<cfreturn this>
 	</cffunction>
 
-	<cffunction name="binary" returntype="any" access="public" hint="adds binary columns to table definition">
+	<cffunction name="boolean" returntype="any" access="public" hint="adds boolean columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
 		<cfscript>
 			var loc = {};
-			arguments.columnType = "binary";
+			arguments.columnType = "boolean";
 			loc.iEnd = ListLen(arguments.columnNames);
 			for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
 				arguments.columnName = ListGetAt(arguments.columnNames,loc.i);
@@ -115,13 +115,13 @@
 		<cfreturn this>
 	</cffunction>
 
-	<cffunction name="boolean" returntype="any" access="public" hint="adds boolean columns to table definition">
+	<cffunction name="date" returntype="any" access="public" hint="adds date columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
 		<cfscript>
 			var loc = {};
-			arguments.columnType = "boolean";
+			arguments.columnType = "date";
 			loc.iEnd = ListLen(arguments.columnNames);
 			for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
 				arguments.columnName = ListGetAt(arguments.columnNames,loc.i);
@@ -131,13 +131,14 @@
 		<cfreturn this>
 	</cffunction>
 
-	<cffunction name="date" returntype="any" access="public" hint="adds date columns to table definition">
+	<cffunction name="datetime" returntype="any" access="public" hint="adds datetime columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfargument name="limit" type="string" required="no" hint="Use 'small' for SQL Server SMALLDATETIME or a numeric value for SQL Server DATETIME2">
 		<cfscript>
 			var loc = {};
-			arguments.columnType = "date";
+			arguments.columnType = "datetime";
 			loc.iEnd = ListLen(arguments.columnNames);
 			for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
 				arguments.columnName = ListGetAt(arguments.columnNames,loc.i);
@@ -146,14 +147,16 @@
 		</cfscript>
 		<cfreturn this>
 	</cffunction>
-
-	<cffunction name="datetime" returntype="any" access="public" hint="adds datetime columns to table definition">
+	
+	<cffunction name="decimal" returntype="any" access="public" hint="adds decimal columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfargument name="precision" type="numeric" required="no" hint="number of digits the column can hold">
+		<cfargument name="scale" type="numeric" required="no" hint="number of digits that can be placed to the right of the decimal point (must be less than or equal to precision)">
 		<cfscript>
 			var loc = {};
-			arguments.columnType = "datetime";
+			arguments.columnType = "decimal";
 			loc.iEnd = ListLen(arguments.columnNames);
 			for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
 				arguments.columnName = ListGetAt(arguments.columnNames,loc.i);
@@ -163,15 +166,15 @@
 		<cfreturn this>
 	</cffunction>
 	
-	<cffunction name="decimal" returntype="any" access="public" hint="adds decimal columns to table definition">
+	<cffunction name="money" returntype="any" access="public" hint="adds money columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
-		<cfargument name="precision" type="numeric" required="no" hint="number of digits the column can hold">
+		<cfargument name="precision" type="string" required="no" hint="number of digits or 'small' for sql server">
 		<cfargument name="scale" type="numeric" required="no" hint="number of digits that can be placed to the right of the decimal point (must be less than or equal to precision)">
 		<cfscript>
 			var loc = {};
-			arguments.columnType = "decimal";
+			arguments.columnType = "money";
 			loc.iEnd = ListLen(arguments.columnNames);
 			for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
 				arguments.columnName = ListGetAt(arguments.columnNames,loc.i);
@@ -199,7 +202,7 @@
 
 	<cffunction name="integer" returntype="any" access="public" hint="adds integer columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
-		<cfargument name="limit" type="numeric" required="no" hint="integer size">
+		<cfargument name="limit" type="string" required="no" hint="integer size or TINY, MEDIUM, SMALL, BIG, UNSIGNED">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
 		<cfscript>
@@ -214,11 +217,48 @@
 		<cfreturn this>
 	</cffunction>
 	
+	<cffunction name="tinyInteger" returntype="any" access="public" hint="adds integer columns to table definition">
+		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
+		<cfargument name="limit" type="string" required="no" hint="Could still be UNSIGNED">
+		<cfargument name="default" type="string" required="no" hint="default value">
+		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfset arguments.limit = listAppend( arguments.limit, "TINY", " " )>
+		<cfreturn integer( argumentCollection = arguments )>
+	</cffunction>
+	
+	<cffunction name="smallInteger" returntype="any" access="public" hint="adds integer columns to table definition">
+		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
+		<cfargument name="limit" type="string" required="no" hint="Could still be UNSIGNED">
+		<cfargument name="default" type="string" required="no" hint="default value">
+		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfset arguments.limit = listAppend( arguments.limit, "SMALL", " " )>
+		<cfreturn integer( argumentCollection = arguments )>
+	</cffunction>
+	
+	<cffunction name="mediumInteger" returntype="any" access="public" hint="adds integer columns to table definition">
+		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
+		<cfargument name="limit" type="string" required="no" hint="Could still be UNSIGNED">
+		<cfargument name="default" type="string" required="no" hint="default value">
+		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfset arguments.limit = listAppend( arguments.limit, "MEDIUM", " " )>
+		<cfreturn integer( argumentCollection = arguments )>
+	</cffunction>
+	
+	<cffunction name="bigInteger" returntype="any" access="public" hint="adds integer columns to table definition">
+		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
+		<cfargument name="limit" type="string" required="no" hint="Could still be UNSIGNED">
+		<cfargument name="default" type="string" required="no" hint="default value">
+		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfset arguments.limit = listAppend( arguments.limit, "BIG", " " )>
+		<cfreturn integer( argumentCollection = arguments )>
+	</cffunction>
+	
 	<cffunction name="string" returntype="any" access="public" hint="adds string columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
-		<cfargument name="limit" type="numeric" required="no" hint="character limit">
+		<cfargument name="limit" type="string" required="no" hint="character limit">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfargument name="encoding" type="string" required="no" hint="character encoding: unicode, ascii or others">
 		<cfscript>
 			var loc = {};
 			arguments.columnType = "string";
@@ -231,10 +271,29 @@
 		<cfreturn this>
 	</cffunction>
 	
+	<cffunction name="char" returntype="any" access="public" hint="adds char columns to table definition">
+		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
+		<cfargument name="limit" type="string" required="no" hint="character limit">
+		<cfargument name="default" type="string" required="no" hint="default value">
+		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfargument name="encoding" type="string" required="no" hint="character encoding: unicode, ascii or others">
+		<cfscript>
+			var loc = {};
+			arguments.columnType = "char";
+			loc.iEnd = ListLen(arguments.columnNames);
+			for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
+				arguments.columnName = ListGetAt(arguments.columnNames,loc.i);
+				column(argumentCollection=arguments);
+			}
+		</cfscript>
+		<cfreturn this>
+	</cffunction>
+	
 	<cffunction name="text" returntype="any" access="public" hint="adds text columns to table definition">
 		<cfargument name="columnNames" type="string" required="yes" hint="one or more column names, comma delimited">
 		<cfargument name="default" type="string" required="no" hint="default value">
 		<cfargument name="null" type="boolean" required="no" hint="whether nulls are allowed">
+		<cfargument name="encoding" type="string" required="no" hint="character encoding: unicode, ascii or others">
 		<cfscript>
 			var loc = {};
 			arguments.columnType = "text";
diff --git a/adapters/Abstract.cfc b/adapters/Abstract.cfc
index 5b95ae1..506ae30 100755
--- a/adapters/Abstract.cfc
+++ b/adapters/Abstract.cfc
@@ -132,7 +132,7 @@
 		<cfargument name="foreignKeys" type="array" required="false" default="#ArrayNew(1)#" hint="array of foreign key definitions">
 		<cfscript>
 		var loc = {};
-		loc.sql = "CREATE TABLE #quoteTableName(LCase(arguments.name))# (#chr(13)##chr(10)#";
+		loc.sql = "CREATE TABLE #quoteTableName(arguments.name)# (#chr(13)##chr(10)#";
 		
 		loc.iEnd = ArrayLen(arguments.primaryKeys);
 		
@@ -180,44 +180,44 @@
 	
 	<cffunction name="dropTable" returntype="string" access="public" hint="generates sql to drop a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
-		<cfreturn "DROP TABLE IF EXISTS #quoteTableName(LCase(arguments.name))#">
+		<cfreturn "DROP TABLE IF EXISTS #quoteTableName(arguments.name)#">
 	</cffunction>
 
 	<cffunction name="addColumnToTable" returntype="string" access="public" hint="generates sql to add a new column to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="column" type="any" required="true" hint="column definition object">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# ADD COLUMN #arguments.column.toSQL()#" />
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# ADD COLUMN #arguments.column.toSQL()#" />
 	</cffunction>
 	
 	<cffunction name="changeColumnInTable" returntype="string" access="public" hint="generates sql to change an existing column in a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="column" type="any" required="true" hint="column definition object">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# CHANGE #quoteColumnName(arguments.column.name)# #arguments.column.toSQL()#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# CHANGE #quoteColumnName(arguments.column.name)# #arguments.column.toSQL()#">
 	</cffunction>
 	
 	<cffunction name="renameColumnInTable" returntype="string" access="public" hint="generates sql to rename an existing column in a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="columnName" type="string" required="true" hint="old column name">
 		<cfargument name="newColumnName" type="string" required="true" hint="new column name">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# RENAME COLUMN #quoteColumnName(arguments.columnName)# TO #quoteColumnName(arguments.newColumnName)#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# RENAME COLUMN #quoteColumnName(arguments.columnName)# TO #quoteColumnName(arguments.newColumnName)#">
 	</cffunction>
 	
 	<cffunction name="dropColumnFromTable" returntype="string" access="public" hint="generates sql to add a foreign key constraint to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="columnName" type="any" required="true" hint="column name">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP COLUMN #quoteColumnName(arguments.columnName)#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# DROP COLUMN #quoteColumnName(arguments.columnName)#">
 	</cffunction>
 
 	<cffunction name="addForeignKeyToTable" returntype="string" access="public" hint="generates sql to add a foreign key constraint to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="foreignKey" type="any" required="true" hint="foreign key definition object">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# ADD #arguments.foreignKey.toSQL()#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# ADD #arguments.foreignKey.toSQL()#">
 	</cffunction>
 	
 	<cffunction name="dropForeignKeyFromTable" returntype="string" access="public" hint="generates sql to add a foreign key constraint to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="keyName" type="any" required="true" hint="foreign key name">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP FOREIGN KEY #quoteTableName(arguments.keyname)#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# DROP FOREIGN KEY #quoteTableName(arguments.keyname)#">
 	</cffunction>
 
 	<cffunction name="foreignKeySQL" returntype="string" access="public" hint="generates sql for foreign key constraint">
@@ -230,7 +230,7 @@
 		<cfargument name="onDelete" type="string" required="false" default="">
 
 		<cfscript>
-			var loc = { sql = "CONSTRAINT #quoteTableName(arguments.name)# FOREIGN KEY (#quoteColumnName(arguments.column)#) REFERENCES #LCase(arguments.referenceTable)#(#quoteColumnName(arguments.referenceColumn)#)" };
+			var loc = { sql = "CONSTRAINT #quoteTableName(arguments.name)# FOREIGN KEY (#quoteColumnName(arguments.column)#) REFERENCES #quoteTableName(arguments.referenceTable)#(#quoteColumnName(arguments.referenceColumn)#)" };
 			for (loc.item in listToArray("onUpdate,onDelete"))
 				{
 					if (len(arguments[loc.item]))
@@ -280,13 +280,105 @@
 		<cfargument name="indexName" type="string" required="false" default="" hint="index name">
 		<cfreturn "DROP INDEX #quoteTableName(arguments.indexName)#">
 	</cffunction>
+	
+	<cffunction name="addRecord" returntype="string" access="public" hint="adds a record to a table">
+		<cfargument name="table" type="string" required="true" hint="table name">
+		<cfargument name="values" type="struct" required="true" hint="struct of column names and values">
+		<cfscript>
+			var loc = {};
+			loc.columnNames = $getColumns( arguments.table );
+			// pre-fill createdAt column
+			if( NOT structKeyExists( arguments.values, "createdAt" ) AND listFindNoCase( loc.columnNames, "createdAt" ) ) {
+				arguments.values.createdAt = now();
+			}
+			// pre-fill updatedAt column
+			if( NOT structKeyExists( arguments.values, "updatedAt" ) AND listFindNoCase( loc.columnNames, "updatedAt" ) ) {
+				arguments.values.updatedAt = now();
+			}
+			
+			loc.sql = "";
+			loc.columnNames = "";
+			loc.columnValues = "";
+			for (loc.key in arguments.values) {
+				loc.columnNames = ListAppend(loc.columnNames,quoteColumnName(loc.key));
+				if(arguments.values[loc.key] IS "NULL") {
+					loc.columnValues = ListAppend(loc.columnValues,arguments.values[loc.key]);
+				} else if(IsNumeric(arguments.values[loc.key])) {
+					loc.columnValues = ListAppend(loc.columnValues,arguments.values[loc.key]);
+				} else if(IsBoolean(arguments.values[loc.key])) {
+					loc.columnValues = ListAppend(loc.columnValues,IIf(arguments.values[loc.key],1,0));
+				} else if(IsDate(arguments.values[loc.key])) {
+					loc.columnValues = ListAppend(loc.columnValues,arguments.values[loc.key]);
+				} else {
+					loc.columnValues = ListAppend(loc.columnValues,"'#ReplaceNoCase(arguments.values[loc.key],"'","''","all")#'");
+				}
+			}
+			loc.sql = "INSERT INTO #quoteTableName(arguments.table)# ( #loc.columnNames# ) VALUES ( #loc.columnValues# )";
+		</cfscript>
+		
+		<cfreturn loc.sql>
+	</cffunction>
 
-	<cffunction name="addRecordPrefix" returntype="string" access="public" hint="generates sql to remove a database index">
-		<cfreturn "">
+	
+	<cffunction name="updateRecord" returntype="void" access="public" hint="updates an existing record in a table">
+		<cfargument name="table" type="string" required="true" hint="table name">
+		<cfargument name="where" type="string" required="false" default="" hint="where condition">
+		<cfargument name="values" type="struct" required="true" hint="struct of column names and values">
+		<cfscript>
+			var loc = {};
+			loc.columnNames = $getColumns( arguments.table );
+			// pre-fill updatedAt column
+			if( NOT structKeyExists( arguments.values, "updatedAt" ) AND listFindNoCase( loc.columnNames, "updatedAt" ) ) {
+				arguments.values.updatedAt = now();
+			}
+			
+			loc.columnUpdates = "";
+			for (loc.key in arguments.values) {
+				loc.update = "#quoteColumnName(loc.key)# = ";
+				if(arguments.values[loc.key] IS "NULL") {
+					loc.update = loc.update & arguments.values[loc.key];
+				} else if(IsNumeric(arguments.values[loc.key])) {
+					loc.update = loc.update & "#arguments.values[loc.key]#";
+				} else if(IsBoolean(arguments.values[loc.key])) {
+					loc.update = loc.update & "#IIf(arguments.values[loc.key],1,0)#";
+				} else if(IsDate(arguments.values[loc.key])) {
+					loc.update = loc.update & "#arguments.values[loc.key]#";
+				} else {
+					arguments.values[loc.key] = ReplaceNoCase(arguments.values[loc.key], "'", "''", "all");
+					loc.update = loc.update & "'#arguments.values[loc.key]#'";
+				}
+				loc.columnUpdates = ListAppend(loc.columnUpdates,loc.update);
+			}
+			if(loc.columnUpdates != '') {
+				loc.sql = 'UPDATE #quoteTableName(arguments.table)# SET #loc.columnUpdates#';
+				if(arguments.where != '') {
+					loc.sql = loc.sql & ' WHERE #arguments.where#';
+				}
+				$execute(loc.sql);
+			}
+		</cfscript>
 	</cffunction>
 
-	<cffunction name="addRecordSuffix" returntype="string" access="public" hint="generates sql to remove a database index">
-		<cfreturn "">
+	
+	<cffunction name="removeRecord" returntype="void" access="public" hint="removes existing records from a table">
+		<cfargument name="table" type="string" required="true" hint="table name">
+		<cfargument name="where" type="string" required="false" default="" hint="where condition">
+		<cfscript>
+			var loc = {};
+			loc.columnNames = $getColumns( arguments.table );
+			// pre-fill deleteAt column for a "soft-delete"
+			if( listFindNoCase( loc.columnNames, "deletedAt" ) ) {
+				loc.values = {};
+				loc.values.deletedAt = now();
+				updateRecord( arguments.table, arguments.where, loc.values );
+			} else {
+				loc.sql = 'DELETE FROM #quoteTableName(arguments.table)#';
+				if(arguments.where != '') {
+					loc.sql = loc.sql & ' WHERE #arguments.where#';
+				}
+				$execute(loc.sql);
+			}
+		</cfscript>
 	</cffunction>
 
 </cfcomponent>
\ No newline at end of file
diff --git a/adapters/MicrosoftSQLServer.cfc b/adapters/MicrosoftSQLServer.cfc
old mode 100755
new mode 100644
index 3bc8d16..440630f
--- a/adapters/MicrosoftSQLServer.cfc
+++ b/adapters/MicrosoftSQLServer.cfc
@@ -4,15 +4,17 @@
 	<cfset variables.sqlTypes['primaryKey'] = "int NOT NULL IDENTITY (1, 1)">
 	<cfset variables.sqlTypes['binary'] = {name='IMAGE'}>
 	<cfset variables.sqlTypes['boolean'] = {name='BIT'}>
-	<cfset variables.sqlTypes['date'] = {name='DATETIME'}>
+	<cfset variables.sqlTypes['date'] = {name='DATE'}>
 	<cfset variables.sqlTypes['datetime'] = {name='DATETIME'}>
 	<cfset variables.sqlTypes['decimal'] = {name='DECIMAL'}>
 	<cfset variables.sqlTypes['float'] = {name='FLOAT'}>
 	<cfset variables.sqlTypes['integer'] = {name='INT'}>
 	<cfset variables.sqlTypes['string'] = {name='VARCHAR',limit=255}>
+	<cfset variables.sqlTypes['char'] = {name='CHAR',limit=64}>
 	<cfset variables.sqlTypes['text'] = {name='TEXT'}>
 	<cfset variables.sqlTypes['time'] = {name='DATETIME'}>
 	<cfset variables.sqlTypes['timestamp'] = {name='DATETIME'}>
+	<cfset variables.sqlTypes['money'] = {name='MONEY'}>
 
 	<cffunction name="adapterName" returntype="string" access="public" hint="name of database adapter">
 		<cfreturn "MicrosoftSQLServer">
@@ -40,17 +42,17 @@
       <cfargument name="primaryKeys" type="array" required="true">
       <cfscript>
       var loc = {};
-	
-	loc.sql = "CONSTRAINT [PK_#arguments.name#] PRIMARY KEY CLUSTERED (";
-	
-	for (loc.i = 1; loc.i lte ArrayLen(arguments.primaryKeys); loc.i++)
-	{
-		if (loc.i != 1) 
-			loc.sql = loc.sql & ", "; 
-		loc.sql = loc.sql & arguments.primaryKeys[loc.i].toColumnNameSQL() & " ASC";
-	}
-	
-	loc.sql = loc.sql & ")"; 
+		
+		loc.sql = "CONSTRAINT [PK_#arguments.name#] PRIMARY KEY CLUSTERED (";
+		
+		for (loc.i = 1; loc.i lte ArrayLen(arguments.primaryKeys); loc.i++)
+		{
+			if (loc.i != 1) 
+				loc.sql = loc.sql & ", "; 
+			loc.sql = loc.sql & arguments.primaryKeys[loc.i].toColumnNameSQL() & " ASC";
+		}
+		
+		loc.sql = loc.sql & ")"; 
       </cfscript>
       <cfreturn loc.sql />
   </cffunction>
@@ -58,7 +60,7 @@
 	<!---  SQL Server uses square brackets to escape table and column names --->
 	<cffunction name="quoteTableName" returntype="string" access="public" hint="surrounds table or index names with quotes">
 		<cfargument name="name" type="string" required="true" hint="column name">
-		<cfreturn "[#Replace(arguments.name,".","`.`","ALL")#]">
+		<cfreturn "[#Replace(arguments.name,".","].[","ALL")#]">
 	</cffunction>
 
 	<cffunction name="quoteColumnName" returntype="string" access="public" hint="surrounds column names with quotes">
@@ -76,26 +78,26 @@
 
 	<cffunction name="dropTable" returntype="string" access="public" hint="generates sql to drop a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
-		<cfreturn "IF EXISTS(SELECT name FROM sysobjects WHERE name = N'#LCase(arguments.name)#' AND xtype='U') DROP TABLE #quoteTableName(LCase(arguments.name))#">
+		<cfreturn "IF EXISTS(SELECT name FROM sysobjects WHERE name = N'#arguments.name#' AND xtype='U') DROP TABLE #quoteTableName(arguments.name)#">
 	</cffunction>
 	
 	<cffunction name="addColumnToTable" returntype="string" access="public" hint="generates sql to add a new column to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="column" type="any" required="true" hint="column definition object">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# ADD #arguments.column.toSQL()#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# ADD #arguments.column.toSQL()#">
 	</cffunction>
 	
 	<cffunction name="changeColumnInTable" returntype="string" access="public" hint="generates sql to change an existing column in a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="column" type="any" required="true" hint="column definition object">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# ALTER COLUMN #arguments.column.toSQL()#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# ALTER COLUMN #arguments.column.toSQL()#">
 	</cffunction>
 	
 	<cffunction name="renameColumnInTable" returntype="string" access="public" hint="generates sql to rename an existing column in a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="columnName" type="string" required="true" hint="old column name">
 		<cfargument name="newColumnName" type="string" required="true" hint="new column name">
-		<cfreturn "EXEC sp_rename '#LCase(arguments.name)#.#arguments.columnName#', '#arguments.newColumnName#'">
+		<cfreturn "EXEC sp_rename '#arguments.name#.#arguments.columnName#', '#arguments.newColumnName#'">
 	</cffunction>
 	
 	<cffunction name="dropColumnFromTable" returntype="string" access="public" hint="generates sql to add a foreign key constraint to a table">
@@ -104,7 +106,7 @@
 		<cfset $removeCheckConstraints(arguments.name, arguments.columnName)>
 		<cfset $removeDefaultConstraint(arguments.name, arguments.columnName)>
 		<cfset $removeIndexes(arguments.name, arguments.columnName)>
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP COLUMN #quoteColumnName(arguments.columnName)#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# DROP COLUMN #quoteColumnName(arguments.columnName)#">
 	</cffunction>
 	
 	<!--- addForeignKeyToTable - use default --->
@@ -112,7 +114,7 @@
 	<cffunction name="dropForeignKeyFromTable" returntype="string" access="public" hint="generates sql to add a foreign key constraint to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="keyName" type="any" required="true" hint="foreign key name">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP CONSTRAINT #arguments.keyname#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# DROP CONSTRAINT #arguments.keyname#">
 	</cffunction>
 	
 	<!--- foreignKeySQL - use default --->
@@ -142,7 +144,7 @@
 		</cfquery>
 		<cfif loc.constraints.RecordCount GT 0>
 			<cfloop query="loc.constraints">
-				<cfset $execute("ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP CONSTRAINT #loc.constraints.constraint_name#")>
+				<cfset $execute("ALTER TABLE #quoteTableName(arguments.name)# DROP CONSTRAINT #loc.constraints.constraint_name#")>
 			</cfloop>
 		</cfif>
 	</cffunction>
@@ -152,7 +154,7 @@
 		<cfargument name="columnName" type="any" required="true" hint="column name">
 		<cfset var loc = {}>
 		<cfquery name="loc.constraints" datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
-			EXEC sp_helpconstraint #quoteTableName(LCase(arguments.name))#, 'nomsg'
+			EXEC sp_helpconstraint #quoteTableName(arguments.name)#, 'nomsg'
 		</cfquery>
 		<cfif StructKeyExists(loc, "constraints") And loc.constraints.RecordCount NEQ "" And loc.constraints.RecordCount GT 0>
 			<cfquery name="loc.constraints" dbtype="query">
@@ -165,7 +167,7 @@
 						<cfqueryparam cfsqltype="cf_sql_varchar" value="DEFAULT on column #arguments.columnName#">
 			</cfquery>
 			<cfloop query="loc.constraints">
-				<cfset $execute("ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP CONSTRAINT #loc.constraints.constraint_name#")>
+				<cfset $execute("ALTER TABLE #quoteTableName(arguments.name)# DROP CONSTRAINT #loc.constraints.constraint_name#")>
 			</cfloop>
 		</cfif>
 	</cffunction>
@@ -205,52 +207,91 @@
 		<cfargument name="type" type="string" required="true" hint="column type">
 		<cfargument name="options" type="struct" required="false" default="#StructNew()#" hint="column options">
 		<cfscript>
-		var sql = '';
-		if(IsDefined("variables.sqlTypes") && structKeyExists(variables.sqlTypes,arguments.type)) {
-			if(IsStruct(variables.sqlTypes[arguments.type])) {
-				sql = variables.sqlTypes[arguments.type]['name'];
-				if(arguments.type == 'decimal') {
-					if(!StructKeyExists(arguments.options,'precision') && StructKeyExists(variables.sqlTypes[arguments.type],'precision')) {
-						arguments.options.precision = variables.sqlTypes[arguments.type]['precision'];
-					}
-					if(!StructKeyExists(arguments.options,'scale') && StructKeyExists(variables.sqlTypes[arguments.type],'scale')) {
-						arguments.options.scale = variables.sqlTypes[arguments.type]['scale'];
-					}
-					if(StructKeyExists(arguments.options,'precision')) {
-						if(StructKeyExists(arguments.options,'scale')) {
-							sql = sql & '(#arguments.options.precision#,#arguments.options.scale#)';
-						} else {
-							sql = sql & '(#arguments.options.precision#)';
-						}
-					}
-				} else if(arguments.type == 'integer') {
-					if(StructKeyExists(arguments.options,'limit')) {
-						sql = sql;
-					}
-				} else {
-					if(!StructKeyExists(arguments.options,'limit') && StructKeyExists(variables.sqlTypes[arguments.type],'limit')) {
-						arguments.options.limit = variables.sqlTypes[arguments.type]['limit'];
-					}
-					if(StructKeyExists(arguments.options,'limit')) {
-						sql = sql & '(#arguments.options.limit#)';
+			var sql = super.typeToSQL( argumentCollection = arguments );
+			if(arguments.type IS 'DATETIME' AND StructKeyExists(arguments.options,'limit') AND arguments.options.limit IS 'SMALL') {
+				sql = 'SMALLDATETIME';
+			} else if(arguments.type IS 'DATETIME' AND StructKeyExists(arguments.options,'limit') AND isNumeric( arguments.options.limit )) {
+				sql = 'DATETIME2(#arguments.options.limit#)';
+			} else if(arguments.type IS 'MONEY' AND StructKeyExists(arguments.options,'limit') AND arguments.options.limit IS 'SMALL') {
+				sql = 'SMALLMONEY';
+			} else if(arguments.type IS 'INTEGER' AND StructKeyExists(arguments.options,'limit') AND arguments.options.limit IS 'BIG') {
+				sql = 'BIGINT';
+			} else if(arguments.type IS 'INTEGER' AND StructKeyExists(arguments.options,'limit') AND arguments.options.limit IS 'SMALL') {
+				sql = 'SMALLINT';
+			} else if(arguments.type IS 'INTEGER' AND StructKeyExists(arguments.options,'limit') AND arguments.options.limit IS 'TINY') {
+				sql = 'TINYINT';
+			} else if(arguments.type IS 'INTEGER' ) {
+				sql = 'INT';
+			} else if(listFindNoCase('CHAR,STRING,TEXT', arguments.type) AND structKeyExists(arguments.options,'encoding') AND listFindNoCase( "utf8,unicode", arguments.options.encoding ) ) {
+				sql = 'N' & sql; // for NCHAR, NVARCHAR, NTEXT
+			}
+		</cfscript>
+		<cfreturn sql>
+	</cffunction>
+
+	<cffunction name="addColumnOptions" returntype="string" access="public">
+		<cfargument name="sql" type="string" required="true" hint="column definition sql">
+		<cfargument name="options" type="struct" required="false" default="#StructNew()#" hint="column options">
+		<cfscript>
+			if(StructKeyExists(arguments.options,'type') && arguments.options.type != 'primaryKey') {
+				if(StructKeyExists(arguments.options,'default') && optionsIncludeDefault(argumentCollection=arguments.options)) {
+					if(arguments.options.default eq "NULL" || (arguments.options.default eq "" && ListFindNoCase("boolean,date,datetime,time,timestamp,decimal,float,integer",arguments.options.type))) {
+						arguments.sql = arguments.sql & " DEFAULT NULL";
+					} else if( find( "(", arguments.options.default ) AND find( ")", arguments.options.default ) ) { // SQL Functions
+						arguments.sql = arguments.sql & " DEFAULT #arguments.options.default#";
+					} else if(arguments.options.type == 'boolean') {
+						arguments.sql = arguments.sql & " DEFAULT #IIf(arguments.options.default,1,0)#";
+					} else if(arguments.options.type == 'string' && arguments.options.default eq "") {
+						arguments.sql = arguments.sql & " DEFAULT ''";
+					} else {
+						arguments.sql = arguments.sql & " DEFAULT #quote(value=arguments.options.default,options=arguments.options)#";
 					}
 				}
-			} else {
-				sql = variables.sqlTypes[arguments.type];
+				if(StructKeyExists(arguments.options,'null') && !arguments.options.null) {
+					arguments.sql = arguments.sql & " NOT NULL";
+				}
+			}
+
+		</cfscript>
+		<cfreturn arguments.sql>
+	</cffunction>
+	
+	<cffunction name="$getIdentityColumn" returntype="string" access="private">
+		<cfargument name="tableName" type="string" required="yes" hint="table name">
+		<cfscript>
+		loc = {};
+	  	loc.columns = $dbinfo(type="columns",table=arguments.tableName,datasource=application.wheels.dataSourceName,username=application.wheels.dataSourceUserName,password=application.wheels.dataSourcePassword);
+		loc.identityCol = "";
+		loc.iEnd = loc.columns.RecordCount;
+		for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
+			if( listFindNoCase( loc.columns["TYPE_NAME"][loc.i], "identity", " " ) ) {
+				loc.identityCol = listAppend( loc.identityCol, loc.columns["COLUMN_NAME"][loc.i] );
+				break;
 			}
 		}
 		</cfscript>
-		<cfreturn sql>
+		<cfreturn loc.identityCol>
 	</cffunction>
 
-	<cffunction name="addRecordPrefix" returntype="string" access="public" hint="prepends sql server identity_insert on to allow inserting primary key values">
-		<cfargument name="table" type="string" required="true" hint="table name">
-		<cfreturn "SET IDENTITY_INSERT #quoteTableName(LCase(arguments.table))# ON">
-	</cffunction>
 
-	<cffunction name="addRecordSuffix" returntype="string" access="public" hint="appends sql server identity_insert on to disallow inserting primary key values">
+	<cffunction name="addRecord" returntype="string" access="public" hint="adds a record to a table">
 		<cfargument name="table" type="string" required="true" hint="table name">
-		<cfreturn "SET IDENTITY_INSERT #quoteTableName(LCase(arguments.table))# OFF">
+		<cfargument name="values" type="struct" required="true" hint="struct of column names and values">
+		<cfscript>
+			var loc = {};
+			loc.sql = super.addRecord( arguments.table, arguments.values );
+			loc.identityCol= $getIdentityColumn( arguments.table );
+			
+			// if trying to insert into an identity column wrap it with IDENTITY_INSERT ON/OFF
+			if( len( loc.identityCol ) AND listFindNoCase( structKeyList( arguments.values ), loc.identityCol ) ) {
+				loc.sql = "SET IDENTITY_INSERT #quoteTableName(arguments.table)# ON;" & chr(10)
+						& loc.sql & ";" & chr(10)
+						& "SET IDENTITY_INSERT #quoteTableName(arguments.table)# OFF;" & chr(10);
+			}
+		</cfscript>
+		<cfreturn loc.sql>
 	</cffunction>
 
-</cfcomponent>
\ No newline at end of file
+
+</cfcomponent>
+
diff --git a/adapters/MySQL.cfc b/adapters/MySQL.cfc
index 50f7015..5c66139 100755
--- a/adapters/MySQL.cfc
+++ b/adapters/MySQL.cfc
@@ -1,19 +1,20 @@
 <cfcomponent extends="Abstract">
 
 	<cfset variables.sqlTypes = {}>
-	<cfset variables.sqlTypes['biginteger'] = {name='BIGINT UNSIGNED'}>
 	<cfset variables.sqlTypes['binary'] = {name='BLOB'}>
-	<cfset variables.sqlTypes['boolean'] = {name='TINYINT',limit=1}>
+	<cfset variables.sqlTypes['boolean'] = {name='BIT'}>
 	<cfset variables.sqlTypes['date'] = {name='DATE'}>
 	<cfset variables.sqlTypes['datetime'] = {name='DATETIME'}>
 	<cfset variables.sqlTypes['decimal'] = {name='DECIMAL'}>
 	<cfset variables.sqlTypes['float'] = {name='FLOAT'}>
 	<cfset variables.sqlTypes['integer'] = {name='INT'}>
 	<cfset variables.sqlTypes['string'] = {name='VARCHAR',limit=255}>
+	<cfset variables.sqlTypes['char'] = {name='CHAR',limit=64}>
 	<cfset variables.sqlTypes['text'] = {name='TEXT'}>
 	<cfset variables.sqlTypes['time'] = {name='TIME'}>
 	<cfset variables.sqlTypes['timestamp'] = {name='TIMESTAMP'}>
 	<cfset variables.sqlTypes['uuid'] = {name='VARBINARY', limit=16}>
+	<cfset variables.sqlTypes['money'] = {name='DECIMAL',precision=19,scale=4}>
 
 	<cffunction name="adapterName" returntype="string" access="public" hint="name of database adapter">
 		<cfreturn "MySQL">
@@ -36,10 +37,10 @@
 		<cfreturn arguments.sql>
 	</cffunction>
 
-	<!---  MySQL uses angle quotes to escape table and column names --->
+	<!---  MySQL uses angle quotes to escape table and column names, and lowercase is strongly preferred --->
 	<cffunction name="quoteTableName" returntype="string" access="public" hint="surrounds table or index names with quotes">
 		<cfargument name="name" type="string" required="true" hint="column name">
-		<cfreturn "`#Replace(arguments.name,".","`.`","ALL")#`">
+		<cfreturn lCase( "`#Replace(arguments.name,".","`.`","ALL")#`" )>
 	</cffunction>
 
 	<cffunction name="quoteColumnName" returntype="string" access="public" hint="surrounds column names with quotes">
@@ -64,7 +65,7 @@
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="columnName" type="string" required="true" hint="old column name">
 		<cfargument name="newColumnName" type="string" required="true" hint="new column name">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# CHANGE COLUMN #quoteColumnName(arguments.columnName)# #quoteColumnName(arguments.newColumnName)# #$getColumnDefinition(tableName=arguments.name,columnName=arguments.columnName)#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# CHANGE COLUMN #quoteColumnName(arguments.columnName)# #quoteColumnName(arguments.newColumnName)# #$getColumnDefinition(tableName=arguments.name,columnName=arguments.columnName)#">
 	</cffunction>
 
 	<!--- MySQL requires table name as well as index name --->
@@ -74,4 +75,41 @@
 		<cfreturn "DROP INDEX #quoteTableName(arguments.indexName)# ON #quoteTableName(arguments.table)#">
 	</cffunction>
 	
+	<cffunction name="typeToSQL" returntype="string">
+		<cfargument name="type" type="string" required="true" hint="column type">
+		<cfargument name="options" type="struct" required="false" default="#StructNew()#" hint="column options">
+		<cfscript>
+			var sql = super.typeToSQL( argumentCollection = arguments );
+			if(arguments.type == 'INTEGER' AND StructKeyExists(arguments.options,'limit') ) {
+				if(arguments.options.limit IS 'BIG') {
+					sql = 'BIGINT';
+				} else if(arguments.options.limit IS 'BIG UNSIGNED') {
+					sql = 'BIGINT UNSIGNED';
+				} else if(arguments.options.limit IS 'UNSIGNED') {
+					sql = 'INT UNSIGNED';
+				} else if(arguments.options.limit IS 'MEDIUM UNSIGNED') {
+					sql = 'MEDIUMINT UNSIGNED';
+				} else if(arguments.options.limit IS 'MEDIUM') {
+					sql = 'MEDIUMINT';
+				} else if(arguments.options.limit IS 'SMALL UNSIGNED') {
+					sql = 'SMALLINT UNSIGNED';
+				} else if(arguments.options.limit IS 'SMALL') {
+					sql = 'SMALLINT';
+				} else if(arguments.options.limit IS 'TINY UNSIGNED') {
+					sql = 'TINYINT UNSIGNED';
+				} else if(arguments.options.limit IS 'TINY') {
+					sql = 'TINYINT';
+				} else if(isNumeric(arguments.options.limit)){
+					sql = 'INT(#arguments.options.limit#)';
+				}
+			} else if(listFindNoCase( 'CHAR,STRING,TEXT', arguments.type ) AND structKeyExists(arguments.options,'encoding') AND len( arguments.options.encoding ) ) {
+				if( arguments.options.encoding IS "unicode" ) {
+					arguments.options.encoding = "utf8";
+				}
+				sql = sql & ' CHARACTER SET #arguments.options.encoding#';,
+			}
+		</cfscript>
+		<cfreturn sql>
+	</cffunction>
+
 </cfcomponent>
\ No newline at end of file
diff --git a/adapters/Oracle.cfc b/adapters/Oracle.cfc
index 63ab2bd..3e9f3e7 100755
--- a/adapters/Oracle.cfc
+++ b/adapters/Oracle.cfc
@@ -13,14 +13,24 @@
 	<cfset variables.sqlTypes['float'] = {name='NUMBER'}>
 	<cfset variables.sqlTypes['integer'] = {name='NUMBER',limit=38}>
 	<cfset variables.sqlTypes['string'] = {name='VARCHAR2',limit=255}>
+	<cfset variables.sqlTypes['char'] = {name='CHAR',limit=64}>
 	<cfset variables.sqlTypes['text'] = {name='CLOB'}>
 	<cfset variables.sqlTypes['time'] = {name='DATE'}>
 	<cfset variables.sqlTypes['timestamp'] = {name='DATE'}>
+	<cfset variables.sqlTypes['money'] = {name='DECIMAL',precision=19,scale=4}>
 
 	<cffunction name="adapterName" returntype="string" access="public" hint="name of database adapter">
 		<cfreturn "Oracle">
 	</cffunction>
 
+	<cffunction name="quoteTableName" returntype="string" access="public" hint="surrounds table with quotes if it's not in plain lowercase">
+		<cfargument name="name" type="string" required="true" hint="column name">
+		<cfif reFind( "[^a-z]", arguments.name )>
+			<cfreturn '"#arguments.name#"'>
+		</cfif>
+		<cfreturn arguments.name>
+	</cffunction>
+
 	<cffunction name="addPrimaryKeyOptions" returntype="string" access="public">
 		<cfargument name="sql" type="string" required="true" hint="column definition sql">
 		<cfargument name="options" type="struct" required="false" default="#StructNew()#" hint="column options">
@@ -99,19 +109,19 @@
 		announce("Dropped sequence #arguments.name#_seq");
 		</cfscript>
 		<!--- DROP TABLE IF EXISTS IS MORE COMPLEX FOR ORACLE --->
-		<cfreturn "DROP TABLE #quoteTableName(LCase(arguments.name))# PURGE">
+		<cfreturn "DROP TABLE #quoteTableName(arguments.name)# PURGE">
 	</cffunction>
 	
 	<cffunction name="addColumnToTable" returntype="string" access="public" hint="generates sql to add a new column to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="column" type="any" required="true" hint="column definition object">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# ADD #arguments.column.toSQL()#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# ADD #arguments.column.toSQL()#">
 	</cffunction>
 	
 	<cffunction name="changeColumnInTable" returntype="string" access="public" hint="generates sql to change an existing column in a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="column" type="any" required="true" hint="column definition object">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# MODIFY #arguments.column.toSQL()#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# MODIFY #arguments.column.toSQL()#">
 	</cffunction>
 	
 	<!--- renameColumnInTable - use default --->
@@ -123,7 +133,7 @@
 	<cffunction name="dropForeignKeyFromTable" returntype="string" access="public" hint="generates sql to add a foreign key constraint to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="keyName" type="any" required="true" hint="foreign key name">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP CONSTRAINT #quoteTableName(arguments.keyname)#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# DROP CONSTRAINT #quoteTableName(arguments.keyname)#">
 	</cffunction>
 	
 	<!--- foreignKeySQL - use default --->
diff --git a/adapters/PostgreSQL.cfc b/adapters/PostgreSQL.cfc
index b47707e..9ed5d30 100755
--- a/adapters/PostgreSQL.cfc
+++ b/adapters/PostgreSQL.cfc
@@ -9,9 +9,11 @@
 	<cfset variables.sqlTypes['float'] = {name='FLOAT'}>
 	<cfset variables.sqlTypes['integer'] = {name='INTEGER'}>
 	<cfset variables.sqlTypes['string'] = {name='CHARACTER VARYING',limit=255}>
+	<cfset variables.sqlTypes['char'] = {name='CHARACTER',limit=64}>
 	<cfset variables.sqlTypes['text'] = {name='TEXT'}>
 	<cfset variables.sqlTypes['time'] = {name='TIME'}>
 	<cfset variables.sqlTypes['timestamp'] = {name='TIMESTAMP'}>
+	<cfset variables.sqlTypes['money'] = {name='DECIMAL',precision=19,scale=4}>
 
 	<cffunction name="adapterName" returntype="string" access="public" hint="name of database adapter">
 		<cfreturn "PostgreSQL">
@@ -29,7 +31,14 @@
 		<cfreturn arguments.sql>
 	</cffunction>
 
-	<!--- postgres uses double quotes --->
+	<cffunction name="quoteTableName" returntype="string" access="public" hint="surrounds table with quotes if it's not in plain lowercase">
+		<cfargument name="name" type="string" required="true" hint="column name">
+		<cfif reFind( "[^a-z]", arguments.name )>
+			<cfreturn '"#arguments.name#"'>
+		</cfif>
+		<cfreturn arguments.name>
+	</cffunction>
+	
 	<cffunction name="quoteColumnName" returntype="string" access="public" hint="surrounds column names with quotes">
 		<cfargument name="name" type="string" required="true" hint="column name">
 		<cfreturn '"#arguments.name#"'>
@@ -60,7 +69,7 @@
 	<cffunction name="dropForeignKeyFromTable" returntype="string" access="public" hint="generates sql to add a foreign key constraint to a table">
 		<cfargument name="name" type="string" required="true" hint="table name">
 		<cfargument name="keyName" type="any" required="true" hint="foreign key name">
-		<cfreturn "ALTER TABLE #quoteTableName(LCase(arguments.name))# DROP CONSTRAINT #quoteTableName(arguments.keyname)#">
+		<cfreturn "ALTER TABLE #quoteTableName(arguments.name)# DROP CONSTRAINT #quoteTableName(arguments.keyname)#">
 	</cffunction>
 	
 	<!--- foreignKeySQL - use default --->
diff --git a/adapters/SQLite.cfc b/adapters/SQLite.cfc
index 290bcb5..9c2989b 100755
--- a/adapters/SQLite.cfc
+++ b/adapters/SQLite.cfc
@@ -9,9 +9,11 @@
 	<cfset variables.sqlTypes['float'] = {name='real'}>
 	<cfset variables.sqlTypes['integer'] = {name='integer'}>
 	<cfset variables.sqlTypes['string'] = {name='text',limit=255}>
+	<cfset variables.sqlTypes['char'] = {name='text',limit=64}>
 	<cfset variables.sqlTypes['text'] = {name='text'}>
 	<cfset variables.sqlTypes['time'] = {name='integer'}>
 	<cfset variables.sqlTypes['timestamp'] = {name='integer'}>
+	<cfset variables.sqlTypes['money'] = {name='real'}>
 
 	<cffunction name="adapterName" returntype="string" access="public" hint="name of database adapter">
 		<cfreturn "SQLite">
diff --git a/basefunctions.cfm b/basefunctions.cfm
index 91d88e3..737db10 100755
--- a/basefunctions.cfm
+++ b/basefunctions.cfm
@@ -75,10 +75,9 @@
 <cffunction name="$getColumnDefinition" returntype="string" access="private">
 	<cfargument name="tableName" type="string" required="yes" hint="table name">
 	<cfargument name="columnName" type="string" required="yes" hint="column name">
-	<cfset var loc = {}>
-	<cfdbinfo name="loc.columns" type="columns" table="#arguments.tableName#" datasource="#application.wheels.dataSourceName#" username="#application.wheels.dataSourceUserName#" password="#application.wheels.dataSourcePassword#">
-    <!--- <cfdump var="#loc#" abort> --->
 	<cfscript>
+	loc = {};
+  	loc.columns = $dbinfo(type="columns",pattern=argumengs.columnName,table=arguments.tableName,datasource=application.wheels.dataSourceName,username=application.wheels.dataSourceUserName,password=application.wheels.dataSourcePassword);
 	loc.columnDefinition = "";
 	loc.iEnd = loc.columns.RecordCount;
 	for (loc.i=1; loc.i <= loc.iEnd; loc.i++) {
@@ -107,4 +106,4 @@
 	}
 	</cfscript>
 	<cfreturn loc.columnDefinition>
-</cffunction>
+</cffunction>
\ No newline at end of file
diff --git a/dbmigrate.cfc b/dbmigrate.cfc
index a341c5d..d2c3803 100644
--- a/dbmigrate.cfc
+++ b/dbmigrate.cfc
@@ -100,7 +100,7 @@
 				<cfset loc.migration.loadError = "">
 				<cfset loc.migration.details = "description unavailable">
 				<cfset loc.migration.status = "">
-				<cftry>
+				<cftry>
 					<cfset loc.migration.cfc = $createObjectFromRoot(path="db.migrate",fileName=loc.migration.cfcfile, method="init")>
 					<cfset loc.metaData = GetMetaData(loc.migration.cfc)>
 					<cfif structKeyExists(loc.metaData,"hint")>
@@ -109,8 +109,8 @@
 					<cfif ListFind(loc.listVersionsPreviouslyMigrated, loc.migration.version) neq 0>
 						<cfset loc.migration.status = "migrated">
 					</cfif>
-					<cfcatch type="any"><cfset loc.migration.loadError = CFCATCH.Message></cfcatch>
-				</cftry>
+					<cfcatch type="any"><cfset loc.migration.loadError = CFCATCH.Message></cfcatch>
+				</cftry>
 				<cfset ArrayAppend(loc.migrations,loc.migration)>
 			</cfif>
 		</cfloop>
@@ -121,6 +121,7 @@
 		<cfargument name="migrationName" type="string" required="true" />
 		<cfargument name="templateName" type="string" required="false" default="blank" />
 		<cfargument name="migrationPrefix" type="string" required="false" default="timestamp" />
+		<cfargument name="tableName" type="string" required="false" default="tableName" />
 		<cfif len(trim(arguments.migrationName)) gt 0>
 			<cfreturn $copyTemplateMigrationAndRename(argumentCollection=arguments)>
 		<cfelse>
@@ -149,10 +150,18 @@
 		<cfargument name="method" type="string" required="true">
 		<cfscript>
 			var loc = {};
-			arguments.returnVariable = "loc.returnValue";
-			arguments.component = arguments.path & "." & arguments.fileName;
-			StructDelete(arguments, "path");
-			StructDelete(arguments, "fileName");
+			loc.returnValue = "";
+			if( listFind( "1.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.1,1.1.3,1.1.4,1.1.5,1.1.6,1.1.7,1.1.8", application.wheels.version ) ) {
+				arguments.returnVariable = "loc.returnValue";
+				arguments.component = arguments.path & "." & arguments.fileName;
+				StructDelete(arguments, "path");
+				StructDelete(arguments, "fileName");
+			} else { // 1.1.9 fix
+				loc.returnVariable = "loc.returnValue";
+				loc.method = arguments.method;
+				loc.component = ListChangeDelims(arguments.path, ".", "/") & "." & ListChangeDelims(arguments.fileName, ".", "/");
+				loc.argumentCollection = arguments;
+			}
 		</cfscript>
 		<cfinclude template="../../root.cfm">
 		<cfreturn loc.returnValue>
@@ -162,6 +171,8 @@
 		<cfargument name="migrationName" type="string" required="true" />
 		<cfargument name="templateName" type="string" required="true" />
 		<cfargument name="migrationPrefix" type="string" required="false" default="" />
+		<cfargument name="tableName" type="string" required="false" default="tableName" />
+		
 		<cfset var loc = {}/>
 		<cfset loc.migrationsPath = expandPath("db/migrate")/>
 		<cfset loc.templateFile = expandPath("plugins/dbmigrate/templates") & "/" & arguments.templateName & ".cfc"/>
@@ -181,6 +192,7 @@
 			
 			<cfset loc.templateContent = replace(loc.templateContent, "[extends]", loc.extendsPath)>
 			<cfset loc.templateContent = replace(loc.templateContent, "[description]", replace(arguments.migrationName,'"','&quot;','ALL'))>
+			<cfset loc.templateContent = replace(loc.templateContent, "[tableName]", arguments.tableName, "all")>
 			
 			<cfset loc.migrationFile = REREplace(arguments.migrationName,"[^A-z0-9]+"," ","ALL")>
 			<cfset loc.migrationFile = REREplace(Trim(loc.migrationFile),"[\s]+","_","ALL")>
diff --git a/index.cfm b/index.cfm
index f6b3282..91d5c72 100644
--- a/index.cfm
+++ b/index.cfm
@@ -1,7 +1,7 @@
 <cfsetting enablecfoutputonly="true">
 
 <cfset dbmigrateMeta = {}>
-<cfset dbmigrateMeta.version = "1.0.1">
+<cfset dbmigrateMeta.version = "1.0.2">
 
 <cfinclude template="basefunctions.cfm">
 
@@ -11,7 +11,8 @@
 <cfelseif isDefined("Form.migrationName")>
 	<cfparam name="Form.templateName" default="">
 	<cfparam name="Form.migrationPrefix" default="">
-	<cfset flashInsert(dbmigrateFeedback2=application.wheels.plugins.dbmigrate.createMigration(Form.migrationName,Form.templateName,Form.migrationPrefix))>
+	<cfparam name="Form.tableName" default="">
+	<cfset flashInsert(dbmigrateFeedback2=application.wheels.plugins.dbmigrate.createMigration(Form.migrationName,Form.templateName,Form.migrationPrefix,Form.tableName))>
 	<cfset redirectTo(back=true)>
 <cfelseif isDefined("url.migrateToVersion") And Len(Trim(url.migrateToVersion)) GT 0 And IsNumeric(url.migrateToVersion)>
   <cfif isDefined("url.password") And Trim(url.password) EQ application.wheels.reloadPassword>
@@ -113,12 +114,16 @@
 						<option value="execute">Execute operation</option>
 					</select>
 				</div>
-				<div class="eight columns">
+				<div class="three columns">
+					<label for="tableName">Table name: (prefills template)</label>
+					<input name="tableName" type="text" class="">
+				</div>
+				<div class="five columns">
 					<label for="migrationName">Migration description: (eg. 'creates member table')</label>
 					<input name="migrationName" type="text" class="">
 				</div>
 				<div class="one columns">
-					<br>
+					<label>&nbsp;</label>
 					<input type="submit" value="Create" class="small button">
 				</div>
 			</div>
diff --git a/templates/change-column.cfc b/templates/change-column.cfc
index a7e7692..d304d69 100644
--- a/templates/change-column.cfc
+++ b/templates/change-column.cfc
@@ -20,12 +20,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-	    changeColumn(table='tableName', columnType='', columnName='columnName', default='', null=true);
+	    changeColumn(table='[tableName]', columnType='', columnName='columnName', default='', null=true);
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-		changeColumn(table='tableName',columnName='columnName');
+		changeColumn(table='[tableName]',columnName='columnName');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/change-table.cfc b/templates/change-table.cfc
index 481a55c..411577a 100644
--- a/templates/change-table.cfc
+++ b/templates/change-table.cfc
@@ -13,14 +13,14 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-    t = changeTable('tableName');
+    t = changeTable('[tableName]');
     
     t.change();
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-    removeColumn(table='tableName',columnName='columnName');
+    removeColumn(table='[tableName]',columnName='columnName');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/create-column.cfc b/templates/create-column.cfc
index 06cb614..0a4168a 100644
--- a/templates/create-column.cfc
+++ b/templates/create-column.cfc
@@ -19,12 +19,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-	    addColumn(table='tableName', columnType='', columnName='columnName', default='', null=true);
+	    addColumn(table='[tableName]', columnType='', columnName='columnName', default='', null=true);
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-		removeColumn(table='tableName',columnName='columnName');
+		removeColumn(table='[tableName]',columnName='columnName');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/create-index.cfc b/templates/create-index.cfc
index 8ce0f92..116da38 100644
--- a/templates/create-index.cfc
+++ b/templates/create-index.cfc
@@ -14,12 +14,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-		addIndex(table='tableName',columnNames='columnName',unique=true);
+		addIndex(table='[tableName]',columnNames='columnName',unique=true);
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-	    removeIndex(table='tableName', indexName='');
+	    removeIndex(table='[tableName]', indexName='');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/create-record.cfc b/templates/create-record.cfc
index 4486592..eee63f2 100644
--- a/templates/create-record.cfc
+++ b/templates/create-record.cfc
@@ -12,12 +12,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-	    addRecord(table='tableName',field='');
+	    addRecord(table='[tableName]',field='');
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-		removeRecord(table='tableName',where='');
+		removeRecord(table='[tableName]',where='');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/create-table.cfc b/templates/create-table.cfc
index d0e9c15..6af1238 100644
--- a/templates/create-table.cfc
+++ b/templates/create-table.cfc
@@ -21,7 +21,7 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-      t = createTable(name='tableName');
+      t = createTable(name='[tableName]');
       
       t.timestamps();
       t.create();
@@ -29,7 +29,7 @@
   </cffunction>
   <cffunction name="down">
     <cfscript>
-      dropTable('tableName');
+      dropTable('[tableName]');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/remove-column.cfc b/templates/remove-column.cfc
index 1f665a4..bd494f0 100644
--- a/templates/remove-column.cfc
+++ b/templates/remove-column.cfc
@@ -13,12 +13,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-		removeColumn(table='tableName',columnName='columnName');
+		removeColumn(table='[tableName]',columnName='columnName');
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-	    addColumn(table='tableName', columnType='', columnName='columnName', default='', null=true);
+	    addColumn(table='[tableName]', columnType='', columnName='columnName', default='', null=true);
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/remove-index.cfc b/templates/remove-index.cfc
index 6915fb2..6557ed1 100644
--- a/templates/remove-index.cfc
+++ b/templates/remove-index.cfc
@@ -12,12 +12,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-	    removeIndex(table='tableName', indexName='');
+	    removeIndex(table='[tableName]', indexName='');
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-		addIndex(table='tableName',columnNames='columnName',unique=true);
+		addIndex(table='[tableName]',columnNames='columnName',unique=true);
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/remove-record.cfc b/templates/remove-record.cfc
index f00659c..57c882c 100644
--- a/templates/remove-record.cfc
+++ b/templates/remove-record.cfc
@@ -12,12 +12,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-		removeRecord(table='tableName',where='');
+		removeRecord(table='[tableName]',where='');
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-	    addRecord(table='tableName',field='');
+	    addRecord(table='[tableName]',field='');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/remove-table.cfc b/templates/remove-table.cfc
index 484ef2a..76660bb 100644
--- a/templates/remove-table.cfc
+++ b/templates/remove-table.cfc
@@ -11,12 +11,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-	    dropTable(name='tableName');
+	    dropTable(name='[tableName]');
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-	    t = createTable(name='tableName');
+	    t = createTable(name='[tableName]');
 	   
 	    t.timestamps();
 	    t.create();
diff --git a/templates/rename-column.cfc b/templates/rename-column.cfc
index 4a105fa..e9f5185 100644
--- a/templates/rename-column.cfc
+++ b/templates/rename-column.cfc
@@ -13,12 +13,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-	    renameColumn(table='tableName', columnName='columnName', newColumnName='newColumnName');
+	    renameColumn(table='[tableName]', columnName='columnName', newColumnName='newColumnName');
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-	    renameColumn(table='tableName', columnName='columnName', newColumnName='newColumnName');
+	    renameColumn(table='[tableName]', columnName='columnName', newColumnName='newColumnName');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/templates/update-record.cfc b/templates/update-record.cfc
index 6b2eee2..07405d0 100644
--- a/templates/update-record.cfc
+++ b/templates/update-record.cfc
@@ -13,12 +13,12 @@
 <cfcomponent extends="[extends]" hint="[description]">
   <cffunction name="up">
     <cfscript>
-	    updateRecord(table='tableName',where='');
+	    updateRecord(table='[tableName]',where='');
     </cfscript>
   </cffunction>
   <cffunction name="down">
     <cfscript>
-		updateRecord(table='tableName',where='');
+		updateRecord(table='[tableName]',where='');
     </cfscript>
   </cffunction>
 </cfcomponent>
\ No newline at end of file
diff --git a/tests/20130328131405_identity_insert.cfc b/tests/20130328131405_identity_insert.cfc
new file mode 100644
index 0000000..7738a47
--- /dev/null
+++ b/tests/20130328131405_identity_insert.cfc
@@ -0,0 +1,15 @@
+<cfcomponent extends="plugins.dbmigrate.Migration" hint="identity_insert test">
+  <cffunction name="up">
+    <cfscript>
+    t = createTable(name='ident_insert',id=false);
+    t.primaryKey(name="pk",type="integer",autoIncrement=true);
+    t.change(true);
+    addRecord(table='ident_insert',pk='10');
+    </cfscript>
+  </cffunction>
+  <cffunction name="down">
+    <cfscript>
+    dropTable(name='ident_insert');
+    </cfscript>
+  </cffunction>
+</cfcomponent>
diff --git a/tests/20130328140935_new_mssql_types.cfc b/tests/20130328140935_new_mssql_types.cfc
new file mode 100644
index 0000000..99ab881
--- /dev/null
+++ b/tests/20130328140935_new_mssql_types.cfc
@@ -0,0 +1,23 @@
+<cfcomponent extends="plugins.dbmigrate.Migration" hint="test new mssql types">
+  <cffunction name="up">
+    <cfscript>
+			t = createTable(name='mssql_types');
+			t.tinyInteger("test_tinyint");
+			t.smallInteger("test_smallint");
+			t.integer("test_int");
+			t.bigInteger("test_bigint");
+			t.date(columnNames="test_date");
+			t.datetime(columnNames="test_datetime");
+			t.datetime(columnNames="test_smalldatetime",limit="small");
+			t.money(columnNames="test_money");
+			t.money(columnNames="test_smallmoney",limit="small");
+			t.create();
+			addRecord(table='mssql_types',test_tinyint=1,test_int=2,test_bigint=3,test_date=now(),test_datetime=now(),test_smalldatetime=now(),test_money=4.56,test_smallmoney=7.89 );
+    </cfscript>
+  </cffunction>
+  <cffunction name="down">
+    <cfscript>
+    dropTable(name='mssql_types');
+    </cfscript>
+  </cffunction>
+</cfcomponent>
diff --git a/tests/20130328140940_new_mysql_types.cfc b/tests/20130328140940_new_mysql_types.cfc
new file mode 100644
index 0000000..9cbbffc
--- /dev/null
+++ b/tests/20130328140940_new_mysql_types.cfc
@@ -0,0 +1,37 @@
+<cfcomponent extends="plugins.dbmigrate.Migration" hint="test new mysql types">
+  <cffunction name="up">
+    <cfscript>
+			t = createTable(name='mysql_types');
+			t.tinyInteger("test_tinyint1");
+			t.tinyInteger("test_tinyint2", "unsigned");
+			t.integer("test_tinyint3", "tiny unsigned");
+			t.smallInteger("test_smallint1");
+			t.smallInteger("test_smallint2", "unsigned");
+			t.integer("test_smallint3", "small unsigned");
+			t.mediumInteger("test_mediumint1");
+			t.mediumInteger("test_mediumint2", "unsigned");
+			t.integer("test_mediumint3", "medium unsigned");
+			t.integer("test_int1");
+			t.integer("test_int2", "unsigned");
+			t.integer("test_int3", "int");
+			t.integer("test_int4", "int unsigned");
+			t.bigInteger("test_bigint1");
+			t.bigInteger("test_bigint2", "unsigned");
+			t.integer("test_bigint3", "big unsigned");
+			t.create();
+			addRecord(table='mysql_types'
+					,test_tinyint1=1,test_tinyint2=2,test_tinyint3=3
+					,test_smallint1=1,test_smallint2=2,test_smallint3=3
+					,test_mediumint1=1,test_mediumint2=2,test_mediumint3=3
+					,test_int1=1,test_int2=2,test_int2=2,test_int3=3,test_int4=4
+					,test_bigint1=1,test_bigint2=2,test_bigint3=3
+
+			);
+    </cfscript>
+  </cffunction>
+  <cffunction name="down">
+    <cfscript>
+    dropTable(name='mysql_types');
+    </cfscript>
+  </cffunction>
+</cfcomponent>
diff --git a/tests/20130401140940_new_strings.cfc b/tests/20130401140940_new_strings.cfc
new file mode 100644
index 0000000..8613633
--- /dev/null
+++ b/tests/20130401140940_new_strings.cfc
@@ -0,0 +1,28 @@
+<cfcomponent extends="plugins.dbmigrate.Migration" hint="test new string types">
+  <cffunction name="up">
+    <cfscript>
+			t = createTable(name='string_types');
+			t.char("char_none");
+			t.char(columnNames="char_ascii",encoding="ascii");
+			t.char(columnNames="char_unicode",encoding="unicode");
+			t.column(columnName="char_column",columnType="string",encoding="utf8");
+			
+			t.string("varchar_none");
+			t.string(columnNames="varchar_ascii",encoding="ascii");
+			t.string(columnNames="varchar_unicode",encoding="unicode");
+			t.column(columnName="varchar_column",columnType="string",encoding="utf8");
+			
+			t.text("text_none");
+			t.text(columnNames="text_ascii",encoding="ascii");
+			t.text(columnNames="text_unicode",encoding="unicode");
+			t.column(columnName="text_column",columnType="string",encoding="utf8");
+			
+			t.create();
+    </cfscript>
+  </cffunction>
+  <cffunction name="down">
+    <cfscript>
+    	dropTable(name='string_types');
+    </cfscript>
+  </cffunction>
+</cfcomponent>
diff --git a/tests/20130402140940_mysql_bit.cfc b/tests/20130402140940_mysql_bit.cfc
new file mode 100644
index 0000000..e8d7ba5
--- /dev/null
+++ b/tests/20130402140940_mysql_bit.cfc
@@ -0,0 +1,17 @@
+<cfcomponent extends="plugins.dbmigrate.Migration" hint="test mysql boolean/bit">
+  <cffunction name="up">
+    <cfscript>
+			t = createTable(name='mysql_bit');
+			t.boolean("foo");
+			t.create();
+      
+			addRecord(table='mysql_bit',foo=true);
+			addRecord(table='mysql_bit',foo=false);
+    </cfscript>
+  </cffunction>
+  <cffunction name="down">
+    <cfscript>
+    	dropTable(name='mysql_bit');
+    </cfscript>
+  </cffunction>
+</cfcomponent>
diff --git a/tests/20130402141040_test_timestamps.cfc b/tests/20130402141040_test_timestamps.cfc
new file mode 100644
index 0000000..e19928c
--- /dev/null
+++ b/tests/20130402141040_test_timestamps.cfc
@@ -0,0 +1,19 @@
+<cfcomponent extends="plugins.dbmigrate.Migration" hint="test createdat / updatedat">
+	<cffunction name="up">
+		<cfscript>
+			t = createTable(name='test_timestamps');
+			t.string("label");
+			t.timestamps();
+			t.create();
+
+			addRecord(table='test_timestamps',label="Foo");
+			addRecord(table='test_timestamps',label="Bar");
+			updateRecord(table='test_timestamps',where="label='Bar'",label="Bar2");
+		</cfscript>
+	</cffunction>
+	<cffunction name="down">
+		<cfscript>
+			dropTable(name='test_timestamps');
+		</cfscript>
+	</cffunction>
+	</cfcomponent>
diff --git a/tests/20130402141043_test_insert_update_null_values.cfc b/tests/20130402141043_test_insert_update_null_values.cfc
new file mode 100644
index 0000000..bb6ba6a
--- /dev/null
+++ b/tests/20130402141043_test_insert_update_null_values.cfc
@@ -0,0 +1,19 @@
+<cfcomponent extends="plugins.dbmigrate.Migration" hint="test insert/update null values">
+	<cffunction name="up">
+		<cfscript>
+			t = createTable(name='test_null');
+			t.string("label",50,"",false,"unicode");
+			t.string("email",50,"null",true,"unicode");
+			t.create();
+			
+			addRecord(table="test_null",label="Foo",email="foo@foo.com");
+			addRecord(table="test_null",label="Bar");
+			addRecord(table="test_null",label="Snork",email="NULL");
+		</cfscript>
+	</cffunction>
+	<cffunction name="down">
+		<cfscript>
+			dropTable('test_null');
+		</cfscript>
+	</cffunction>
+	</cfcomponent>