@@ -112,22 +112,31 @@ public static javaxt.sql.Database getDatabase(){
             return (javaxt.sql.Database) val.toObject();
         }
         else{
-            JSONObject json = val.toJSONObject();
-            if (json==null) return null;
-            javaxt.sql.Database database = new javaxt.sql.Database();
-            database.setDriver(json.get("driver").toString());
-            database.setHost(json.get("host").toString());
-            database.setName(json.get("name").toString());
-            database.setUserName(json.get("username").toString());
-            database.setPassword(json.get("password").toString());
-            if (json.has("maxConnections")){
-                database.setConnectionPoolSize(json.get("maxConnections").toInteger());
-            }
-            setDatabase(database);
+            javaxt.sql.Database database = getDatabase(val);
+            if (database!=null) setDatabase(database);
             return database;
         }
     }
 
+    public static javaxt.sql.Database getDatabase(JSONValue val){
+        return getDatabase(val.toJSONObject());
+    }
+
+    public static javaxt.sql.Database getDatabase(JSONObject json){
+        if (json==null) return null;
+        javaxt.sql.Database database = new javaxt.sql.Database();
+        database.setDriver(json.get("driver").toString());
+        database.setHost(json.get("host").toString());
+        database.setName(json.get("name").toString());
+        database.setUserName(json.get("username").toString());
+        database.setPassword(json.get("password").toString());
+        if (json.has("maxConnections")){
+            database.setConnectionPoolSize(json.get("maxConnections").toInteger());
+        }
+        setDatabase(database);
+        return database;
+    }
+
 
   //**************************************************************************
   //** setDatabase
 
@@ -11,6 +11,7 @@ public class ServiceResponse {
     private int status = 200;
     //private String statusMessage; //not generally used or required
     private javaxt.utils.Date date; //<--Used for eTags and 304 responses
+    private String cache;
     private String authMessage;
     private Object response;
 
@@ -118,6 +119,14 @@ public Long getContentLength(){
         return contentLength;
     }
 
+    public void setCache(String cache){
+        this.cache = cache;
+    }
+
+    public String getCache(){
+        return cache;
+    }
+
 //    public void setStatus(int status){
 //        this.status = status;
 //    }
 
@@ -304,9 +304,9 @@ private ServiceResponse list(Class c, ServiceRequest request, Database database)
                 JSONArray row = new JSONArray();
 
                 JSONObject record = DbUtils.getJson(rs);
-                Iterator<String> it = record.keys();
-                while (it.hasNext()){
-                    String fieldName = it.next();
+                for (javaxt.sql.Field field : rs.getFields()){
+                    String fieldName = field.getName().toLowerCase();
+                    fieldName = StringUtils.underscoreToCamelCase(fieldName);
                     if (x==0) cols.add(fieldName);
                     row.add(record.get(fieldName));
                 }