Add assignment-by-id lookup