Mark self referential 1:1 and 1:N pending on 1.8.7