--- a/src/core/type-id.h	Mon Apr 14 16:19:17 2008 -0700
+++ b/src/core/type-id.h	Thu Apr 17 13:42:25 2008 -0700
@@ -163,7 +163,7 @@
    * \returns the value with which the associated attribute 
    *          is initialized.
    */
-  Attribute GetAttributeInitialValue (uint32_t i) const;
+  Ptr<const AttributeValue> GetAttributeInitialValue (uint32_t i) const;
   /**
    * \param i index into attribute array.
    * \returns the flags associated to the requested attribute.
@@ -264,7 +264,7 @@
    */
   TypeId AddAttribute (std::string name,
                        std::string help, 
-                       Attribute initialValue,
+                       const AttributeValue &initialValue,
                        Ptr<const AttributeAccessor> accessor,
                        Ptr<const AttributeChecker> checker);
 
@@ -283,7 +283,7 @@
   TypeId AddAttribute (std::string name,
                        std::string help, 
                        uint32_t flags,
-                       Attribute initialValue,
+                       const AttributeValue &initialValue,
                        Ptr<const AttributeAccessor> accessor,
                        Ptr<const AttributeChecker> checker);
 
@@ -308,7 +308,7 @@
     // The accessor associated to the attribute.
     Ptr<const AttributeAccessor> accessor;
     // The initial value associated to the attribute.
-    Attribute initialValue;
+    Ptr<const AttributeValue> initialValue;
     // The set of access control flags associated to the attribute.
     uint32_t flags;
     // The checker associated to the attribute.