More Integration Changes