SITE-387: Added support for resolving id-based model references