adding initial linked object support