--- a/strokedb-ruby/TODO
+++ b/strokedb-ruby/TODO
@@ -15,7 +15,7 @@ Completed items are removed.
 [ ] Improve PointQuery (I really don't like it)
 [ ] Refactor Meta#document, fix bugs
 [ ] Think about non-index named meta lookup
-[.] Refactor callback stuff in Document — call on_initialization only for specified meta (add param to execute_callbacks?)
+[.] Refactor callback stuff in Document
 [ ] "Valid Document's JSON with multiple meta names specified" spec should check callback through message sending, not instance vars
 [ ] Drop :marshal serialization method or figure out why it is not really working now (run test/playing2.rb with :marshal and see)
 [ ] Add #[index] API to Document::Versions, with negative indexes as well.

--- a/strokedb-ruby/lib/document/document.rb
+++ b/strokedb-ruby/lib/document/document.rb
@@ -81,7 +81,7 @@ module StrokeDB
         if _module
           @document.extend(_module)
           _module.send!(:setup_callbacks,@document) rescue nil
-          @document.send!(:execute_callbacks, :on_initialization)
+          @document.send!(:execute_callbacks_for, _module, :on_initialization)
         end
         @document[:__meta__] = self
       end
@@ -278,7 +278,13 @@ module StrokeDB
         callback.call(self)
       end
     end
-
+    
+    def execute_callbacks_for(origin,name)
+      (callbacks[name.to_s]||[]).each do |callback|
+        callback.call(self) if callback.origin == origin
+      end
+    end
+    
     def do_initialize(store, slots={}, uuid=nil)
       @callbacks = {}
       @store = store

--- a/strokedb-ruby/lib/document/meta.rb
+++ b/strokedb-ruby/lib/document/meta.rb
@@ -1,5 +1,15 @@
 module StrokeDB
 
+  class Callback
+    attr_reader :origin
+    def initialize(origin,&block)
+      @origin, @block = origin, block
+    end
+    def call(*args)
+      @block.call(*args)
+    end
+  end
+  
   module Meta
 
     class << self
@@ -112,6 +122,7 @@ module StrokeDB
     def setup_callbacks(doc)
       CALLBACKS.each do |callback_name| 
         if callback = instance_variable_get("@#{callback_name}_block")
+          callback = Callback.new(self,&callback)
           doc.callbacks[callback_name] ||= []
           doc.callbacks[callback_name] << callback
         end

--- a/strokedb-ruby/spec/document/meta_spec.rb
+++ b/strokedb-ruby/spec/document/meta_spec.rb
@@ -112,11 +112,24 @@ describe "Meta module with on_initialization callback" do
     end
   end
   
-  it "should call callback block on meta instantiation" do
+  it "should receive this callback on meta instantiation" do
     Kernel.should_receive(:on_initialization_called).with(true)
-    s = SomeName.new
+    doc = SomeName.new
   end
-
+  
+  it "should be a sole meta receiving this callback when adding metas dynamically" do
+    Object.send!(:remove_const,'SomeOtherName') if defined?(SomeOtherName)
+    SomeOtherName = Meta.new do
+      on_initialization do |obj|
+        Kernel.send!(:other_on_initialization_called,obj.new?)
+      end
+    end
+    Kernel.should_receive(:other_on_initialization_called).with(true).once
+    doc = SomeOtherName.new
+    Kernel.should_receive(:on_initialization_called).with(true).once
+    doc.metas << SomeName
+  end
+  
 end
 
 describe "Meta module with before_save callback" do
@@ -133,7 +146,7 @@ describe "Meta module with before_save callback" do
     end
   end
   
-  it "should call callback block on Document#save! (before actually saving it)" do
+  it "should receive callback on Document#save! (before actually saving it)" do
     Kernel.should_receive(:before_save_called).with(true)
     s = SomeName.new
     s.save!
@@ -155,7 +168,7 @@ describe "Meta module with after_save callback" do
     end
   end
   
-  it "should call callback block on Document#save! (after actually saving it)" do
+  it "should receive callback on Document#save! (after actually saving it)" do
     Kernel.should_receive(:after_save_called).with(false)
     s = SomeName.new
     s.save!