Updated to use newer domains