Upgraded declared-in to link back to referenced item in base Model