diff --git a/+dj/+internal/Declare.m b/+dj/+internal/Declare.m
index 34e3d4d2..66651b05 100644
--- a/+dj/+internal/Declare.m
+++ b/+dj/+internal/Declare.m
@@ -11,10 +11,10 @@
             'STRING', '^((var)?char|enum|date|(var)?year|time|timestamp)', ...
             'INTERNAL_BLOB', '^(tiny|medium|long)?blob$', ...
             'EXTERNAL_BLOB', '^blob@(?<store>[a-z]\w*)$', ...
-            'INTERNAL_ATTACH', 'attach$', ...
+            'INTERNAL_ATTACH', '^attach$', ...
             'EXTERNAL_ATTACH', '^attach@(?<store>[a-z]\w*)$', ...
             'FILEPATH', '^filepath@(?<store>[a-z]\w*)$', ...
-            'UUID', 'uuid$' ...
+            'UUID', '^uuid$' ...
         )
         SPECIAL_TYPES = {'UUID', 'INTERNAL_ATTACH', 'EXTERNAL_ATTACH', 'EXTERNAL_BLOB', ...
             'FILEPATH', 'ADAPTED'}
diff --git a/+dj/+internal/TableAccessor.m b/+dj/+internal/TableAccessor.m
index 85eb1c3b..af8d69db 100644
--- a/+dj/+internal/TableAccessor.m
+++ b/+dj/+internal/TableAccessor.m
@@ -27,7 +27,7 @@
                 name = splitName{2};
                 addprop(self, name);
                 tableName = schema.tableNames(className{1});
-                tierClass = dj.Schema.tierClasses{2}; % default to Manual table
+                tierClass = 'dj.Manual';
                 for k=1:numel(dj.Schema.tierPrefixes)
                     tierCharLen = length(dj.Schema.tierPrefixes{k});
                     if tierCharLen > 0 && ~isempty(regexp(dj.Schema.tierPrefixes{k}, ...