Ref handler Fix + ObjectId management