Updates to main manifest and SouthJapan manifest