v0.0.12 - SITE-387 - Resolve model references