Adding missing integration related changes