haystack 2.x compatibility