Use a global object manager instead of passing objects
Fix merge