Improved model referencing