gistfile1.diff

diff --git a/lib/dm-core.rb b/lib/dm-core.rb
index f494604..982402c 100644
--- a/lib/dm-core.rb
+++ b/lib/dm-core.rb
@@ -69,15 +69,6 @@ require 'dm-core/support/lazy_array'
 require 'dm-core/support/local_object_space'
 require 'dm-core/support/hook'
 require 'dm-core/support/subject'
-require 'dm-core/model'
-require 'dm-core/model/descendant_set'
-require 'dm-core/model/hook'
-require 'dm-core/model/is'
-require 'dm-core/model/scope'
-require 'dm-core/model/relationship'
-require 'dm-core/model/property'
-
-require 'dm-core/collection'
 
 require 'dm-core/type'
 require 'dm-core/types/boolean'
@@ -105,6 +96,16 @@ require 'dm-core/property/discriminator'
 require 'dm-core/property/lookup'
 require 'dm-core/property_set'
 
+require 'dm-core/model'
+require 'dm-core/model/descendant_set'
+require 'dm-core/model/hook'
+require 'dm-core/model/is'
+require 'dm-core/model/scope'
+require 'dm-core/model/relationship'
+require 'dm-core/model/property'
+
+require 'dm-core/collection'
+
 require 'dm-core/adapters'
 require 'dm-core/adapters/abstract_adapter'
 require 'dm-core/associations/relationship'
@@ -113,7 +114,6 @@ require 'dm-core/associations/one_to_one'
 require 'dm-core/associations/many_to_one'
 require 'dm-core/associations/many_to_many'
 require 'dm-core/identity_map'
-require 'dm-core/property'
 require 'dm-core/property_set'
 require 'dm-core/query'
 require 'dm-core/query/conditions/operation'
diff --git a/lib/dm-core/model.rb b/lib/dm-core/model.rb
index 7234b22..8e21ff0 100644
--- a/lib/dm-core/model.rb
+++ b/lib/dm-core/model.rb
@@ -721,15 +721,8 @@ module DataMapper
 
     # @api private
     def const_missing(name)
-      if name == :DM
-        warn "#{name} prefix deprecated and no longer necessary (#{caller[0]})"
-        self
-      elsif name == :Resource
+      if name == :Resource
         Resource
-      elsif const = DataMapper::Property.find_class(name)
-        const
-      elsif DataMapper::Types.const_defined?(name)
-        DataMapper::Types.const_get(name)
       else
         super
       end
diff --git a/lib/dm-core/model/property.rb b/lib/dm-core/model/property.rb
index db2f25e..3f003cf 100644
--- a/lib/dm-core/model/property.rb
+++ b/lib/dm-core/model/property.rb
@@ -7,7 +7,7 @@
 module DataMapper
   module Model
     module Property
-      Model.append_extensions self
+      Model.append_extensions self, DataMapper::Property::Lookup
 
       extend Chainable
 
diff --git a/spec/support/types/huge_integer.rb b/spec/support/types/huge_integer.rb
index 11901d0..5ef46ae 100644
--- a/spec/support/types/huge_integer.rb
+++ b/spec/support/types/huge_integer.rb
@@ -1,16 +1,16 @@
 module DataMapper
-  module Types
+  class Property
     class HugeInteger < DataMapper::Property::String
-      def self.load(value, property)
+      def load(value)
         value.to_i unless value.nil?
       end
 
-      def self.dump(value, property)
+      def dump(value)
         value.to_s unless value.nil?
       end
 
-      def self.typecast(value, property)
-        load(value, property)
+      def typecast(value)
+        load(value)
       end
     end
   end