Work on tracking already-existing associated objects [ci skip]