Refactor

 - The objects are intialized using the objects rather than the ID.