Use haystack 2.0.0