Added the object reference to build the object relationship
Fixed a minor bug to make build sucessful