Additional changes due to the previous instance conversions