Add code for completion and linking of objects