Actually, don't we need to replace certain fields even if it isn't an instance unit?