diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index 08a116d4d3..2a5d68b838 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -264,6 +264,9 @@
         <property name="contentService">
             <ref bean="contentService" />
         </property>
+        <property name="dictionaryService">
+            <ref bean="dictionaryService" />
+        </property>
         <property name="metadataExtracterRegistry">
             <ref bean="metadataExtracterRegistry" />
         </property>
diff --git a/config/alfresco/messages/content-model.properties b/config/alfresco/messages/content-model.properties
index ff55684c43..92537bc6dd 100644
--- a/config/alfresco/messages/content-model.properties
+++ b/config/alfresco/messages/content-model.properties
@@ -71,6 +71,11 @@ cm_contentmodel.property.cm_modifier.description=Who last modified this item
 cm_contentmodel.property.cm_accessed.title=Last Accessed Date
 cm_contentmodel.property.cm_accessed.description=When this item was last accessed 
 
+cm_contentmodel.aspect.cm_author.title=Author
+cm_contentmodel.aspect.cm_author.description=Author
+cm_contentmodel.property.cm_author.title=Author
+cm_contentmodel.property.cm_author.description=Author
+
 cm_contentmodel.aspect.cm_localizable.title=Localizable
 cm_contentmodel.aspect.cm_localizable.description=Localizable
 cm_contentmodel.property.cm_locale.title=Locale
diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index f3769b75a7..58bfd9768f 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -218,7 +218,7 @@
                <type>d:datetime</type>
             </property>
             <property name="cm:creator">
-               <title>Author</title>
+               <title>Creator</title>
                <type>d:text</type>
             </property>
             <property name="cm:modified">
@@ -309,7 +309,7 @@
          <parent>cm:auditable</parent>
          <!-- TODO: Support mandatory-aspects on an aspect in the meta-model
          <mandatory-aspects>
-            <aspect>Auditable</aspect>
+            <aspect>cm:auditable</aspect>
          </mandatory-aspects>
          -->
          <properties>
@@ -329,15 +329,20 @@
             </property>
          </properties>
       </aspect>
+      
+      <aspect name="cm:author">
+         <title>Author</title>
+         <properties>
+            <property name="cm:author">
+               <title>Author</title>
+               <type>d:text</type> 
+            </property>
+         </properties>
+      </aspect>
    
       <aspect name="cm:dublincore">
          <title>Dublin Core</title>
          <parent>cm:titled</parent>
-         <!-- TODO: Support mandatory-aspects on an aspect in the meta-model
-         <mandatory-aspects>
-            <aspect>Auditable</aspect>
-         </mandatory-aspects>
-         -->
          <properties>
             <property name="cm:publisher">
                <title>Publisher</title>
@@ -372,13 +377,17 @@
                <type>d:text</type>
             </property>
          </properties>
+         <mandatory-aspects>
+            <aspect>cm:auditable</aspect>
+            <aspect>cm:author</aspect>
+         </mandatory-aspects>
       </aspect>
    
       <!--
       <aspect name="cm:subjectable">
          <title>Subjectable</title>
          <mandatory-aspects>
-            <aspect>Auditable</aspect>
+            <aspect>cm:auditable</aspect>
          </mandatory-aspects>
          <properties>
             <property name="cm:subject">
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index d73abb1618..ba004acf68 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -83,6 +83,10 @@ public interface ContentModel
     static final QName PROP_MODIFIER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "modifier");
     static final QName PROP_ACCESSED = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "accessed");
     
+    // author aspect
+    static final QName ASPECT_AUTHOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "author");
+    static final QName PROP_AUTHOR = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "author");
+    
     // categories
     static final QName TYPE_CATEGORYROOT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "category_root");  
     static final QName ASPECT_CLASSIFIABLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "classifiable");
diff --git a/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java b/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
index cbcd6c3ecb..91f220acec 100644
--- a/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/action/executer/ContentMetadataExtracter.java
@@ -26,6 +26,9 @@ import org.alfresco.repo.content.metadata.MetadataExtracter;
 import org.alfresco.repo.content.metadata.MetadataExtracterRegistry;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.dictionary.ClassDefinition;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -96,6 +99,19 @@ public class ContentMetadataExtracter extends ActionExecuterAbstractBase
     {
         this.contentService = contentService;
     }
+    
+    /**
+     * The dictionary service
+     */
+    private DictionaryService dictionaryService;
+    
+    /**
+     * @param dictService  The DictionaryService to set.
+     */
+    public void setDictionaryService(DictionaryService dictService)
+    {
+        this.dictionaryService = dictService;
+    }
 
     /**
      * Our Extracter
@@ -140,10 +156,29 @@ public class ContentMetadataExtracter extends ActionExecuterAbstractBase
                     boolean changed = false;
                     for (QName key : newProps.keySet())
                     {
+                        // check if we need to add an aspect for the prop
+                        ClassDefinition propClass = dictionaryService.getProperty(key).getContainerClass();
+                        if (propClass.isAspect() &&
+                            nodeService.hasAspect(actionedUponNodeRef, propClass.getName()) == false)
+                        {
+                            Map<QName, Serializable> aspectProps = new HashMap<QName, Serializable>(3, 1.0f);
+                            for (QName defKey : propClass.getProperties().keySet())
+                            {
+                                if (dictionaryService.getProperty(defKey).isMandatory())
+                                {
+                                    aspectProps.put(defKey, allProps.get(defKey));
+                                    allProps.remove(defKey);
+                                }
+                            }
+                            nodeService.addAspect(actionedUponNodeRef, propClass.getName(), aspectProps);
+                        }
+                        
                         Serializable value = newProps.get(key);
                         if (value == null)
+                        {
                             continue; // Content extracters shouldn't do this
-
+                        }
+                        
                         // Look up the old value, and check for nulls
                         Serializable oldValue = allProps.get(key);
                         if (oldValue == null || oldValue.toString().length() == 0)
@@ -152,11 +187,11 @@ public class ContentMetadataExtracter extends ActionExecuterAbstractBase
                             changed = true;
                         }
                     }
-                    // TODO: Should we be adding the associated aspects or is
-                    // that done by the type system
-                    // (or are ad-hoc properties allowed?)
+                    
                     if (changed)
+                    {
                         nodeService.setProperties(actionedUponNodeRef, allProps);
+                    }
                 }
             }
         }
diff --git a/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
index 5c0ce275ff..9530b21626 100644
--- a/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/HtmlMetadataExtracter.java
@@ -116,7 +116,7 @@ public class HtmlMetadataExtracter extends AbstractMetadataExtracter
                         if (name.equalsIgnoreCase("creator") || name.equalsIgnoreCase("author")
                                 || name.equalsIgnoreCase("dc.creator"))
                         {
-                            trimPut(ContentModel.PROP_CREATOR, valueO, tempDestination);
+                            trimPut(ContentModel.PROP_AUTHOR, valueO, tempDestination);
                         }
                         if (name.equalsIgnoreCase("description") || name.equalsIgnoreCase("dc.description"))
                         {
diff --git a/source/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java
index 93d3580752..e0ced6bb33 100644
--- a/source/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/MP3MetadataExtracter.java
@@ -138,7 +138,7 @@ public class MP3MetadataExtracter extends AbstractMetadataExtracter
             }
             if (props.get(PROP_ARTIST) != null)
             {
-                destination.put(ContentModel.PROP_CREATOR, props.get(PROP_ARTIST));
+                destination.put(ContentModel.PROP_AUTHOR, props.get(PROP_ARTIST));
             }
             String description = getDescription(props);
             if (description != null)
diff --git a/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
index 964a4ed698..d6bc5dc547 100644
--- a/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/OfficeMetadataExtracter.java
@@ -71,9 +71,8 @@ public class OfficeMetadataExtracter extends AbstractMetadataExtracter
 
                         // Auditable aspect
                         trimPut(ContentModel.PROP_CREATED, si.getCreateDateTime(), destination);
-                        trimPut(ContentModel.PROP_CREATOR, si.getAuthor(), destination);
-                        trimPut(ContentModel.PROP_MODIFIED, si.getLastSaveDateTime(), destination);
-                        trimPut(ContentModel.PROP_MODIFIER, si.getLastAuthor(), destination);
+                        trimPut(ContentModel.PROP_MODIFIED, si.getLastSaveDateTime(), destination); 
+                        trimPut(ContentModel.PROP_AUTHOR, si.getAuthor(), destination);
                     }
                     else if (ps instanceof DocumentSummaryInformation)
                     {
diff --git a/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
index 8bdc6c96a6..0364ad9b55 100644
--- a/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/OpenDocumentMetadataExtracter.java
@@ -78,7 +78,7 @@ public class OpenDocumentMetadataExtracter extends AbstractMetadataExtracter
             if (docInfo != null)
             {
                 // set the metadata
-                destination.put(ContentModel.PROP_CREATOR, docInfo.getCreator());
+                destination.put(ContentModel.PROP_AUTHOR, docInfo.getCreator());
                 destination.put(ContentModel.PROP_TITLE, docInfo.getTitle());
                 destination.put(ContentModel.PROP_DESCRIPTION, docInfo.getDescription());
                 destination.put(ContentModel.PROP_CREATED, docInfo.getCreationDate());
diff --git a/source/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java
index 65724a1420..c34f0b81c3 100644
--- a/source/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/PdfBoxMetadataExtracter.java
@@ -60,7 +60,7 @@ public class PdfBoxMetadataExtracter extends AbstractMetadataExtracter
             // Scoop out the metadata
             PDDocumentInformation docInfo = pdf.getDocumentInformation();
 
-            trimPut(ContentModel.PROP_CREATOR, docInfo.getAuthor(), destination);
+            trimPut(ContentModel.PROP_AUTHOR, docInfo.getAuthor(), destination);
             trimPut(ContentModel.PROP_TITLE, docInfo.getTitle(), destination);
             trimPut(ContentModel.PROP_DESCRIPTION, docInfo.getSubject(), destination);
 
diff --git a/source/java/org/alfresco/repo/content/metadata/UnoMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/UnoMetadataExtracter.java
index 68785e1feb..53e0754d03 100644
--- a/source/java/org/alfresco/repo/content/metadata/UnoMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/UnoMetadataExtracter.java
@@ -146,7 +146,7 @@ public class UnoMetadataExtracter extends AbstractMetadataExtracter
                     // Auditable aspect
                     // trimPut(ContentModel.PROP_CREATED,
                     // si.getCreateDateTime(), destination);
-                    trimPut(ContentModel.PROP_CREATOR, propSet.getPropertyValue("Author"), destination);
+                    trimPut(ContentModel.PROP_AUTHOR, propSet.getPropertyValue("Author"), destination);
                     // trimPut(ContentModel.PROP_MODIFIED,
                     // si.getLastSaveDateTime(), destination);
                     // trimPut(ContentModel.PROP_MODIFIER, si.getLastAuthor(),
diff --git a/source/java/org/alfresco/service/namespace/QNameMap.java b/source/java/org/alfresco/service/namespace/QNameMap.java
index b0bdaae62d..721508883d 100644
--- a/source/java/org/alfresco/service/namespace/QNameMap.java
+++ b/source/java/org/alfresco/service/namespace/QNameMap.java
@@ -73,7 +73,7 @@ public class QNameMap<K,V> implements Map, Cloneable
      */
     public boolean containsKey(Object key)
     {
-        return (this.contents.containsKey(QName.resolveToQNameString(resolver, (String)key)));
+        return (this.contents.containsKey(QName.resolveToQNameString(resolver, key.toString())));
     }
     
     /**
@@ -100,7 +100,7 @@ public class QNameMap<K,V> implements Map, Cloneable
      */
     public Object put(Object key, Object value)
     {
-        return this.contents.put(QName.resolveToQNameString(resolver, (String)key), value);
+        return this.contents.put(QName.resolveToQNameString(resolver, key.toString()), value);
     }
     
     /**
@@ -108,7 +108,7 @@ public class QNameMap<K,V> implements Map, Cloneable
      */
     public Object remove(Object key)
     {
-        return this.contents.remove(QName.resolveToQNameString(resolver, (String)key));
+        return this.contents.remove(QName.resolveToQNameString(resolver, key.toString()));
     }
     
     /**