improving model reference handling across collections