Changed relation reference handling